]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
vstart_runner.py: improve a conditional in _do_run
authorRishabh Dave <ridave@redhat.com>
Fri, 19 Jun 2020 06:40:07 +0000 (12:10 +0530)
committerRishabh Dave <ridave@redhat.com>
Fri, 19 Jun 2020 06:43:57 +0000 (12:13 +0530)
Before checking for "/" in args[0], check if it's an instance of Raw.
Since Raw instances aren't iterable, the execution would crash here.

Fixes: https://tracker.ceph.com/issues/46100
Signed-off-by: Rishabh Dave <ridave@redhat.com>
qa/tasks/vstart_runner.py

index 82a7c95ff5d77f1afce1bc98e1af7326a3010542..6873d3d404954ccb0e768ea5b76cc284fe89aa5c 100644 (file)
@@ -371,7 +371,7 @@ class LocalRemote(object):
                                              'ceph-coverage')]
 
         # Adjust binary path prefix if given a bare program name
-        if "/" not in args[0]:
+        if not isinstance(args[0], Raw) and "/" not in args[0]:
             # If they asked for a bare binary name, and it exists
             # in our built tree, use the one there.
             local_bin = os.path.join(BIN_PREFIX, args[0])