Skip to content

Commit

Permalink
DAOS-15655 test: fix set_daos_params conflict (#14286)
Browse files Browse the repository at this point in the history
Fix an uncaught merge confclit between #14100 and #14201

Signed-off-by: Dalton Bohning <[email protected]>
  • Loading branch information
daltonbohning authored Apr 30, 2024
1 parent 919bb8c commit c1225e4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tests/ftest/rebuild/continues_after_stop.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c1225e4

Please sign in to comment.