]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/cephfs/kernel_mount: fix incomplete py3 transition backport
authorRamana Raja <rraja@redhat.com>
Wed, 10 Jun 2020 11:22:14 +0000 (16:52 +0530)
committerRamana Raja <rraja@redhat.com>
Mon, 15 Jun 2020 09:41:02 +0000 (15:11 +0530)
Commit 3dad1ac5f2db97cc3445bdf14a80dbb3e11f7d21 wan an incomplete
backport of 875b45f3c903781ba99dbd2fcf4d2fc89001c25b. The missing
commit lines are added here.

Introduced-by: 3dad1ac5f2db97cc3445bdf14a80dbb3e11f7d21
Fixes: https://tracker.ceph.com/issues/45966
Signed-off-by: Ramana Raja <rraja@redhat.com>
qa/tasks/cephfs/kernel_mount.py

index a27293c6dc89f19c5537be9624d197700164b10b..3df4bdec5260e5f5d3be606482c0df87dcc61643 100644 (file)
@@ -210,10 +210,10 @@ class KernelMount(CephFSMount):
             print(json.dumps(get_id_to_dir()))
             """)
 
-        p = self.client_remote.run(args=[
-            'sudo', 'python', '-c', pyscript
-        ], stdout=StringIO(), timeout=(5*60))
-        client_id_to_dir = json.loads(p.stdout.getvalue())
+        output = self.client_remote.sh([
+            'sudo', 'python3', '-c', pyscript
+        ], timeout=(5*60))
+        client_id_to_dir = json.loads(output)
 
         try:
             return client_id_to_dir[self.client_id]