DAOS-16662 test: update some tests to use unique dfuse mount (#15242)

Update some tests to use unique dfuse mount directory by letting the framework generate one. Remove mount_dir from run_ior_multiple_variants since it is no longer needed and this level of fine control should be handled per test ideally. Signed-off-by: Dalton Bohning <[email protected]>
daos-stack · Nov 13, 2024 · 6e7032f · 6e7032f
1 parent 0db1219
commit 6e7032f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 19 deletions.
diff --git a/src/tests/ftest/deployment/basic_checkout.py b/src/tests/ftest/deployment/basic_checkout.py
@@ -65,21 +65,18 @@ def test_basiccheckout_ior_mdtest_small(self):
         # local param
         flags = self.params.get("ior_flags", '/run/ior/iorflags/*')
         apis = self.params.get("ior_api", '/run/ior/iorflags/*')
-        dfuse_mount_dir = self.params.get("mount_dir", "/run/dfuse/*")
-        transfer_block_size = self.params.get("transfer_block_size",
-                                              '/run/ior/iorflags/*')
+        transfer_block_size = self.params.get("transfer_block_size", '/run/ior/iorflags/*')
         obj_class = self.params.get("obj_class", '/run/ior/iorflags/*')
         ec_obj_class = self.params.get("ec_oclass", '/run/ior/*')
         mdtest_params = self.params.get("mdtest_params", "/run/mdtest/*")
 
         # run ior
-        results = self.run_ior_multiple_variants(obj_class, apis, transfer_block_size,
-                                                 flags, dfuse_mount_dir)
+        results = self.run_ior_multiple_variants(obj_class, apis, transfer_block_size, flags)
 
         # run ior with different ec oclass
         results_ec = self.run_ior_multiple_variants(ec_obj_class, [apis[0]],
                                                     [transfer_block_size[1]],
-                                                    [flags[0]], dfuse_mount_dir)
+                                                    [flags[0]])
         results = results + results_ec
         self.log.info("Summary of IOR small test results:")
         errors = False

diff --git a/src/tests/ftest/deployment/basic_checkout.yaml b/src/tests/ftest/deployment/basic_checkout.yaml
@@ -157,7 +157,6 @@ mdtest:
     - [DFS, 4096, 4096, 1, 25, 20, '-u']
     - [POSIX, 0, 0, 2, 10, 5, '-u -C -T -r']
 dfuse:
-  mount_dir: "/tmp/daos_dfuse/"
   disable_caching: true
 hdf5_vol:
   plugin_path: /usr/lib64/mpich/lib
diff --git a/src/tests/ftest/dfuse/mu_perms.yaml b/src/tests/ftest/dfuse/mu_perms.yaml
@@ -24,7 +24,6 @@ dfuse:
   multi_user: true
 dfuse_with_caching:
   multi_user: true
-  mount_dir: "/tmp/daos_dfuse"
 client_users:
   # Two users in the same group. One user in a separate group
   - daos_test_user_x1:daos_test_group_x1

diff --git a/src/tests/ftest/dfuse/simul.yaml b/src/tests/ftest/dfuse/simul.yaml
@@ -13,8 +13,6 @@ server_config:
           scm_mount: /mnt/daos
 pool:
   scm_size: 2G
-dfuse:
-  mount_dir: "/tmp/daos_dfuse"
 container:
   type: POSIX
   control_method: daos

diff --git a/src/tests/ftest/ior/small.py b/src/tests/ftest/ior/small.py
@@ -1,5 +1,5 @@
 """
-(C) Copyright 2018-2023 Intel Corporation.
+(C) Copyright 2018-2024 Intel Corporation.
 
 SPDX-License-Identifier: BSD-2-Clause-Patent
 """
@@ -33,12 +33,10 @@ def test_ior_small(self):
         cncl_tickets = []
         flags = self.params.get("ior_flags", '/run/ior/iorflags/*')
         apis = self.params.get("ior_api", '/run/ior/iorflags/*')
-        dfuse_mount_dir = self.params.get("mount_dir", "/run/dfuse/*")
         transfer_block_size = self.params.get("transfer_block_size", '/run/ior/iorflags/*')
         obj_class = self.params.get("obj_class", '/run/ior/iorflags/*')
 
-        results = self.run_ior_multiple_variants(obj_class, apis, transfer_block_size,
-                                                 flags, dfuse_mount_dir)
+        results = self.run_ior_multiple_variants(obj_class, apis, transfer_block_size, flags)
         # Running a variant for ior fpp
         self.ior_cmd.flags.update(flags[1])
         self.ior_cmd.api.update(apis[0])

diff --git a/src/tests/ftest/ior/small.yaml b/src/tests/ftest/ior/small.yaml
@@ -63,7 +63,6 @@ ior:
       - SX
       - RP_2GX
 dfuse:
-  mount_dir: "/tmp/daos_dfuse/"
   disable_caching: true
 hdf5_vol:
   plugin_path: /usr/lib64/mpich/lib
diff --git a/src/tests/ftest/util/ior_test_base.py b/src/tests/ftest/util/ior_test_base.py
@@ -294,8 +294,7 @@ def stop_ior(self, job_manager):
 
         return None
 
-    def run_ior_multiple_variants(self, obj_class, apis, transfer_block_size,
-                                  flags, mount_dir):
+    def run_ior_multiple_variants(self, obj_class, apis, transfer_block_size, flags):
         """Run multiple ior commands with various different combination of ior input params.
 
         Args:
@@ -306,7 +305,6 @@ def run_ior_multiple_variants(self, obj_class, apis, transfer_block_size,
                                        1M is transfer size and 32M is
                                        block size in the above example.
             flags(list): list of ior flags. Only the first index is used
-            mount_dir(str): dfuse mount directory
         """
         results = []
 
@@ -333,7 +331,7 @@ def run_ior_multiple_variants(self, obj_class, apis, transfer_block_size,
                     try:
                         self.run_ior_with_pool(
                             intercept=intercept, plugin_path=hdf5_plugin_path,
-                            timeout=self.ior_timeout, mount_dir=mount_dir)
+                            timeout=self.ior_timeout)
                         results.append(["PASS", str(self.ior_cmd)])
                     except CommandFailure:
                         results.append(["FAIL", str(self.ior_cmd)])