Skip to content

Commit

Permalink
mgr/dashboard/qa: CephfsTest - admin_socket() got an unexpected keywo…
Browse files Browse the repository at this point in the history
…rd argument 'timeout'

Adapt method arguments of LocalRemote::run() according to teuthology.orchestra.run.run() (see https://github.com/ceph/teuthology/blob/master/teuthology/orchestra/run.py#L364) to be able to run QA tests locally in a vstart cluster.

Fixes: http://tracker.ceph.com/issues/36581
Signed-off-by: Volker Theile <vtheile@suse.com>
  • Loading branch information
votdev committed Oct 26, 2018
1 parent 399923c commit 00e3022
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions qa/tasks/vstart_runner.py
Expand Up @@ -231,7 +231,7 @@ def put_file(self, src, dst, sudo=False):

def run(self, args, check_status=True, wait=True,
stdout=None, stderr=None, cwd=None, stdin=None,
logger=None, label=None, env=None):
logger=None, label=None, env=None, timeout=None):

# We don't need no stinkin' sudo
args = [a for a in args if a != "sudo"]
Expand Down Expand Up @@ -606,9 +606,11 @@ def raw_cluster_cmd_result(self, *args, **kwargs):
proc = self.controller.run([os.path.join(BIN_PREFIX, "ceph")] + list(args), **kwargs)
return proc.exitstatus

def admin_socket(self, daemon_type, daemon_id, command, check_status=True):
def admin_socket(self, daemon_type, daemon_id, command, check_status=True, timeout=None):
return self.controller.run(
args=[os.path.join(BIN_PREFIX, "ceph"), "daemon", "{0}.{1}".format(daemon_type, daemon_id)] + command, check_status=check_status
args=[os.path.join(BIN_PREFIX, "ceph"), "daemon", "{0}.{1}".format(daemon_type, daemon_id)] + command,
check_status=check_status,
timeout=timeout
)


Expand Down

0 comments on commit 00e3022

Please sign in to comment.