update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / test / spdkcli / spdkcli_job.py

diff --git a/ceph/src/spdk/test/spdkcli/spdkcli_job.py b/ceph/src/spdk/test/spdkcli/spdkcli_job.py
index 70a957bbaa3715a5c83a156963f9f3779254edb3..ce6530a90a968269dd146869c68e93e88b5fbf2a 100755 (executable)
--- a/ceph/src/spdk/test/spdkcli/spdkcli_job.py
+++ b/ceph/src/spdk/test/spdkcli/spdkcli_job.py
@@ -15,23 +15,29 @@ def execute_command(cmd, element=None, element_exists=False):
     if ls_tree and element:
         child.sendline("ls %s" % ls_tree)
         child.expect("/>")
-        print("child: %s" % child.before.decode())
         if element_exists:
             if element not in child.before.decode():
-                print("Element %s not in list" % element)
+                print("Element %s not in list:\n%s" % (element, child.before.decode()))
                 exit(1)
         else:
             if element in child.before.decode():
-                print("Element %s is in list" % element)
+                print("Element %s is in list:\n%s" % (element, child.before.decode()))
                 exit(1)
 
 
 if __name__ == "__main__":
     socket = "/var/tmp/spdk.sock"
+    port = None
     if len(sys.argv) == 3:
         socket = sys.argv[2]
+    elif len(sys.argv) == 4:
+        port = sys.argv[3]
     testdir = os.path.dirname(os.path.realpath(sys.argv[0]))
-    child = pexpect.spawn(os.path.join(testdir, "../../scripts/spdkcli.py") + " -s %s" % socket)
+
+    if port is None:
+        child = pexpect.spawn(os.path.join(testdir, "../../scripts/spdkcli.py") + " -s %s" % socket)
+    else:
+        child = pexpect.spawn(os.path.join(testdir, "../../scripts/spdkcli.py") + " -s %s -p %s" % (socket, port))
     child.expect(">")
     child.sendline("cd /")
     child.expect("/>")