]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/cephfs: python3
authorSage Weil <sage@redhat.com>
Thu, 19 Dec 2019 03:51:52 +0000 (21:51 -0600)
committerRamana Raja <rraja@redhat.com>
Mon, 15 Jun 2020 09:43:20 +0000 (15:13 +0530)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 3c751fea7f48ef613286211797a7eafc4913b36e)

Conflicts:
qa/tasks/cephfs/kernel_mount.py
qa/tasks/cephfs/test_volume_client.py

qa/tasks/cephfs/mount.py

index e56010b4aa521d230176496aa8080d9aad2ea2a7..86beb45ec0949e1ccfd7653a63a492ecd5446071 100644 (file)
@@ -146,13 +146,13 @@ class CephFSMount(object):
             'sudo', 'rm', '-f', os.path.join(self.mountpoint, filename)
         ])
 
-    def _run_python(self, pyscript, py_version='python'):
+    def _run_python(self, pyscript, py_version='python3'):
         return self.client_remote.run(
                args=['sudo', 'adjust-ulimits', 'daemon-helper', 'kill',
                      py_version, '-c', pyscript], wait=False, stdin=run.PIPE,
                stdout=StringIO())
 
-    def run_python(self, pyscript, py_version='python'):
+    def run_python(self, pyscript, py_version='python3'):
         p = self._run_python(pyscript, py_version)
         p.wait()
         return six.ensure_str(p.stdout.getvalue().strip())
@@ -339,7 +339,7 @@ class CephFSMount(object):
 
         log.info("check lock on file {0}".format(basename))
         self.client_remote.run(args=[
-            'sudo', 'python', '-c', pyscript
+            'sudo', 'python3', '-c', pyscript
         ])
 
     def write_background(self, basename="background_file", loop=False):