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

refac: renamed and split the test scheduler in two fonctions

parent 49bf8ed1
No related branches found
No related tags found
1 merge request!5New dynamic schedulers: fcfs and easy-bf
......@@ -23,13 +23,6 @@ def pytest_generate_tests(metafunc):
filename=abspath(workload_file)) for workload_file in workload_files]
metafunc.parametrize('workload_static', workloads)
if 'basic_algo_no_param' in metafunc.fixturenames:
algos = [
'easy_bf',
'fcfs'
]
metafunc.parametrize('basic_algo_no_param', algos)
if 'platform_multiC' in metafunc.fixturenames:
platform_files = glob.glob('test/platforms/multicore/*.xml')
platforms = [Platform(
......
......@@ -6,14 +6,37 @@ import unittest
from helper import *
def test_basic_algo_no_param(platform_monoC, workload_static, basic_algo_no_param):
test_name = f'{basic_algo_no_param}-{platform_monoC.name}-{workload_static.name}'
def test_fcfs(platform_monoC, workload_static):
"""Tests the scheduler fcfs with different platform and workload files"""
sched = "fcfs"
test_name = f'{sched}-{platform_monoC.name}-{workload_static.name}'
output_dir, robin_filename, _ = init_instance(test_name)
batcmd = gen_batsim_cmd(platform_monoC.filename, workload_static.filename, output_dir, "")
instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd,
schedcmd=f"batmen -v '{basic_algo_no_param}'",
schedcmd=f"batmen -v '{sched}'",
simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0
)
instance.to_file(robin_filename)
ret = run_robin(robin_filename)
assert ret.returncode == 0
def test_easy_bf(platform_monoC, workload_static):
"""Tests the scheduler easy backfilling with different platform and workload files"""
sched = "easy_bf"
test_name = f'{sched}-{platform_monoC.name}-{workload_static.name}'
output_dir, robin_filename, _ = init_instance(test_name)
batcmd = gen_batsim_cmd(platform_monoC.filename, workload_static.filename, output_dir, "")
instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd,
schedcmd=f"batmen -v '{sched}'",
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