Skip to content

Commit

Permalink
Revert 54d1b81 as it broke valgrind run. (#201)
Browse files Browse the repository at this point in the history
Revert 262b22a as it broke valgrind run.
  • Loading branch information
MeirShpilraien authored Oct 23, 2023
1 parent 262b22a commit 481b254
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ jobs:
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
if: matrix.python == '3.9' && matrix.platform != 'macos-11'
continue-on-error: true
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
Expand Down
5 changes: 4 additions & 1 deletion RLTest/redis_std.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ def __init__(self, redisBinaryPath, port=6379, modulePath=None, moduleArgs=None,
self.port = -1
self.slavePort = -1

if self.has_interactive_debugger and serverId > 1:
assert self.noCatch and not self.useSlaves and not self.clusterEnabled

if self.useUnix:
if self.clusterEnabled:
raise ValueError('Unix sockets cannot be used with cluster mode')
Expand Down Expand Up @@ -170,7 +173,7 @@ def _getRedisVersion(self):

def createCmdArgs(self, role):
cmdArgs = []
if self.debugger and role == MASTER and self.masterServerId == 1:
if self.debugger:
cmdArgs += self.debugger.generate_command(self._getValgrindFilePath(role) if not self.noCatch else None)

cmdArgs += [self.redisBinaryPath]
Expand Down

0 comments on commit 481b254

Please sign in to comment.