From: Sage Weil <sage@redhat.com>
Date: Thu, 19 Dec 2019 03:51:52 +0000 (-0600)
Subject: qa/tasks/cephfs: python3
X-Git-Tag: v14.2.10~4^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2aec65c538655891116812739955f458588d754;p=ceph.git

qa/tasks/cephfs: python3

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

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index e56010b4aa521..86beb45ec0949 100644
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -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):