From: Rishabh Dave <ridave@redhat.com>
Date: Fri, 19 Jun 2020 06:40:07 +0000 (+0530)
Subject: vstart_runner.py: improve a conditional in _do_run
X-Git-Tag: wip-pdonnell-testing-20200918.022351~873^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ff990c2a1cf3ed70542bfe9b0569d45bdba6833;p=ceph-ci.git

vstart_runner.py: improve a conditional in _do_run

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>
---

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 82a7c95ff5d..6873d3d4049 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -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])