fix ftest failures

Test-tag: hw,medium,DmgPoolQueryTest hw,medium,ListVerboseTest Allow-unstable-test: true Signed-off-by: Tom Nabarro <[email protected]>
daos-stack · Jan 20, 2025 · c251d1c · c251d1c
1 parent 0de7e10
commit c251d1c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/tests/ftest/control/dmg_pool_query_test.py b/src/tests/ftest/control/dmg_pool_query_test.py
@@ -1,5 +1,6 @@
 """
   (C) Copyright 2020-2024 Intel Corporation.
+  (C) Copyright 2025 Hewlett Packard Enterprise Development LP
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 """
@@ -98,10 +99,8 @@ def test_pool_query_basic(self):
                     "size": self.params.get("total", path="/run/exp_vals/nvme/*")
                 }
             ],
-            "mem_file_bytes": (
-                self.params.get("total", path="/run/exp_vals/scm/*") if
-                self.server_managers[0].manager.job.using_control_metadata else
-                0)
+            "md_on_ssd_active": self.server_managers[0].manager.job.using_control_metadata,
+            "mem_file_bytes": self.params.get("total", path="/run/exp_vals/scm/*"),
         }
 
         self.assertDictEqual(

diff --git a/src/tests/ftest/pool/list_verbose.py b/src/tests/ftest/pool/list_verbose.py
@@ -1,5 +1,6 @@
 """
   (C) Copyright 2018-2024 Intel Corporation.
+  (C) Copyright 2025 Hewlett Packard Enterprise Development LP
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 """
@@ -110,10 +111,8 @@ def create_expected(self, pool, scm_free, nvme_free, scm_imbalance,
                     "imbalance": nvme_imbalance
                 },
             ],
-            "mem_file_bytes": (
-                scm_size if
-                self.server_managers[0].manager.job.using_control_metadata else
-                0)
+            "md_on_ssd_active": self.server_managers[0].manager.job.using_control_metadata,
+            "mem_file_bytes": scm_size,
         }
 
     @staticmethod

diff --git a/src/tests/ftest/util/dmg_utils.py b/src/tests/ftest/util/dmg_utils.py
@@ -1,5 +1,6 @@
 """
   (C) Copyright 2018-2024 Intel Corporation.
+  (C) Copyright 2025 Hewlett Packard Enterprise Development LP
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 """
@@ -605,7 +606,7 @@ def pool_create(self, scm_size, uid=None, gid=None, nvme_size=None,
         #     256000000,
         #     0
         #   ],
-        #   "mem_file_bytes": 0
+        #   "mem_file_bytes": 256000000
         # },
         # "error": null,
         # "status": 0