From: Rishabh Dave <ridave@redhat.com>
Date: Wed, 10 Mar 2021 04:39:54 +0000 (+0530)
Subject: qa/cephfs: don't take parameter cwd in _create_mntpt()
X-Git-Tag: v17.1.0~2595^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b346657418af521ac9cc5ae7c2589fa0a596fc8;p=ceph.git

qa/cephfs: don't take parameter cwd in _create_mntpt()

Accepting "cwd" as a parameter in _create_mntpt() methods was a mistake
that happened commit 5e71e9b065b690ede5644b12937dfdb9eec93147.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py
index 202a69b2ab65..4ced0df23ae5 100644
--- a/qa/tasks/cephfs/fuse_mount.py
+++ b/qa/tasks/cephfs/fuse_mount.py
@@ -62,7 +62,7 @@ class FuseMount(CephFSMount):
         log.info("Client client.%s config is %s" % (self.client_id,
                                                     self.client_config))
 
-        self._create_mntpt(cwd=self.test_dir)
+        self._create_mntpt()
 
         retval = self._run_mount_cmd(mntopts, check_status)
         if retval:
diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index 50cd378fa005..a5c0256c9bf2 100644
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -175,7 +175,7 @@ class CephFSMount(object):
         self.fs.wait_for_daemons()
         log.info('Ready to start {}...'.format(type(self).__name__))
 
-    def _create_mntpt(self, cwd=None):
+    def _create_mntpt(self):
         stderr = StringIO()
         # Use 0000 mode to prevent undesired modifications to the mountpoint on
         # the local file system.
diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index f5fed7c00ce3..73480af9c80d 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -707,12 +707,11 @@ class LocalFuseMount(LocalCephFSMount, FuseMount):
         self._mount_cmd_cwd, self._mount_cmd_logger, \
             self._mount_cmd_stdin = None, None, None
 
-    def _create_mntpt(self, cwd=None):
+    def _create_mntpt(self):
         stderr = StringIO()
         script = f'mkdir -p -v {self.hostfs_mntpt}'.split()
         try:
-            self.client_remote.run(args=script, cwd=self.test_dir,
-                                   stderr=stderr)
+            self.client_remote.run(args=script, stderr=stderr)
         except CommandFailedError:
             if 'file exists' not in stderr.getvalue().lower():
                 raise