Skip to content
Snippets Groups Projects
Commit 74cfc8e8 authored by Maël Madon's avatar Maël Madon
Browse files

refac: adapted the CLI calls in the tests to remove the option queue_order

parent 06141374
Branches
Tags
1 merge request!13Some cleanup the repo
Pipeline #5510 passed
......@@ -113,7 +113,6 @@ void BinPackingEnergy::on_simulation_start(
// PPK_ASSERT_ERROR(
// batsim_config["dynamic-jobs-enabled"].GetBool(), "This algorithm only
// works if dynamic job are enabled!");
// TODO: send an error if the order asked in not DescendingSizeOrder
/* TODO (wait for batsim5.0):
* - retrieve the nb of cores per machine from the platform file and
......
......@@ -41,7 +41,7 @@ def error_user(user_name, platform_multiC, expected_error="", test_name=None, sc
"--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse")
instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd,
schedcmd=f"batmen -v bin_packing --queue_order=desc_size --variant_options_filepath {schedconf}",
schedcmd=f"batmen -v bin_packing --variant_options_filepath {schedconf}",
simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0
)
......
......@@ -36,7 +36,7 @@ def test_broker_multi(platform_multiC, workload_static, sched_multi):
batcmd = gen_batsim_cmd(platform_multiC.filename, workload_static.filename, output_dir, "--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse")
instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd,
schedcmd=f"batmen -v {sched_multi.name} --queue_order=desc_size --variant_options_filepath test/schedconf/user_description_file.json",
schedcmd=f"batmen -v {sched_multi.name} --variant_options_filepath test/schedconf/user_description_file.json",
simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0
)
......
......@@ -34,7 +34,7 @@ def test_bin_packing(platform_multiC, workload_static):
batcmd = gen_batsim_cmd(platform_multiC.filename, workload_static.filename, output_dir, "--energy --enable-compute-sharing")
instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd,
schedcmd=f"batmen -v {sched} --queue_order=desc_size",
schedcmd=f"batmen -v {sched}",
simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0
)
......@@ -57,7 +57,7 @@ def test_bin_packing_energy(platform_multiC, workload_static):
batcmd = gen_batsim_cmd(platform_multiC.filename, workload_static.filename, output_dir, "--energy --enable-compute-sharing")
instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd,
schedcmd=f"batmen -v {sched} --queue_order=desc_size",
schedcmd=f"batmen -v {sched}",
simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0
)
......
......@@ -50,7 +50,7 @@ def run_user(user_name, platform_multiC, test_name=None, schedconf=None):
"--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse")
instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd,
schedcmd=f"batmen -v bin_packing --queue_order=desc_size --variant_options_filepath {schedconf}",
schedcmd=f"batmen -v bin_packing --variant_options_filepath {schedconf}",
simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment