test

ceph · Nov 23, 2022 · 65888ee · 65888ee
1 parent f43a632
commit 65888ee
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/qa/tasks/cephfs/test_fscrypt.py b/qa/tasks/cephfs/test_fscrypt.py
@@ -28,7 +28,7 @@ def test_fscrypt(self):
         # and error message in some cases) and print custom log messages
         # accordingly.
         proc = self.mount_a.client_remote.run(args=['sudo', './check',
-            '-g', 'encrypt'], cwd=self.repo_path, stdout=StringIO(),
+            'generic/395'], cwd=self.repo_path, stdout=StringIO(),
             stderr=StringIO(), timeout=900, check_status=False,omit_sudo=False,
             label='running tests for encrypt from xfstests-dev')
 

diff --git a/qa/tasks/cephfs/xfstests_dev.py b/qa/tasks/cephfs/xfstests_dev.py
@@ -80,9 +80,9 @@ def get_test_and_scratch_dirs_ready(self):
         # read var name as "scratch dir's mount path"
         self.scratch_dirs_mount_path = self.mount_a.client_remote.mkdtemp(
             suffix=self.scratch_dirname)
-        self.mount_a.run_shell(['sudo','ln','-s',join(self.mount_a.mountpoint,
-                                                      self.scratch_dirname),
-                                self.scratch_dirs_mount_path])
+        #self.mount_a.run_shell(['sudo','ln','-s',join(self.mount_a.mountpoint,
+        #                                              self.scratch_dirname),
+        #                        self.scratch_dirs_mount_path])
 
     def install_deps(self):
         from teuthology.misc import get_system_type
@@ -123,6 +123,15 @@ def install_deps(self):
         self.mount_a.client_remote.run(args=args, omit_sudo=False)
 
     def create_reqd_users(self):
+        self.mount_a.client_remote.run(args=['sudo', 'userdel', '--force',
+                                             '--remove', 'fsgqa'],
+                                       omit_sudo=False, check_status=False)
+        self.mount_a.client_remote.run(args=['sudo', 'userdel', '--force',
+                                             '--remove', '123456-fsgqa'],
+                                       omit_sudo=False, check_status=False)
+        self.mount_a.client_remote.run(args=['sudo', 'groupdel', 'fsgqa'],
+                                       omit_sudo=False, check_status=False)
+
         self.mount_a.client_remote.run(args=['sudo', 'useradd', 'fsgqa'],
                                        omit_sudo=False, check_status=False)
         self.mount_a.client_remote.run(args=['sudo', 'groupadd', 'fsgqa'],