From c1225e449ac223b81f481d82fe9530d3dcc3d5ba Mon Sep 17 00:00:00 2001 From: Dalton Bohning Date: Tue, 30 Apr 2024 10:05:46 -0700 Subject: [PATCH] DAOS-15655 test: fix set_daos_params conflict (#14286) Fix an uncaught merge confclit between #14100 and #14201 Signed-off-by: Dalton Bohning --- src/tests/ftest/rebuild/continues_after_stop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/ftest/rebuild/continues_after_stop.py b/src/tests/ftest/rebuild/continues_after_stop.py index 6f29b41e8bf..bd0b6d6107a 100644 --- a/src/tests/ftest/rebuild/continues_after_stop.py +++ b/src/tests/ftest/rebuild/continues_after_stop.py @@ -28,7 +28,7 @@ def run_ior_basic(self, namespace, pool, container): """ ior_cmd = IorCommand(namespace=namespace) ior_cmd.get_params(self) - ior_cmd.set_daos_params(self.server_group, pool, container.identifier) + ior_cmd.set_daos_params(pool, container.identifier) testfile = os.path.join(os.sep, "test_file_1") ior_cmd.test_file.update(testfile) manager = get_job_manager(test=self, job=ior_cmd, subprocess=self.subprocess)