diff options
Diffstat (limited to 'test/test_run.py')
| -rw-r--r-- | test/test_run.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/test/test_run.py b/test/test_run.py index 17bdca8..d164bb4 100644 --- a/test/test_run.py +++ b/test/test_run.py @@ -2,15 +2,15 @@ import os from test_general import SalisTest -class TestRun(SalisTest): - NAME = "test-run.sim" - PUSH_POW = 8 +SIM_NAME = "test-run.sim" +PUSH_POW = 8 +class TestRun(SalisTest): def cmds(self, anc, arch): return ( ( - f"./salis.py new -a{anc} -d{TestRun.PUSH_POW} -f -g{compiler} -H{self.tempdir.name} -n{TestRun.NAME} {optimized} -s{seed} -upush -Utest/ui/ -v{arch} -y{TestRun.PUSH_POW}", - f"./salis.py load -g{compiler} -H{self.tempdir.name} -n{TestRun.NAME} {optimized} -upush -Utest/ui/", + f"./salis.py new -a{anc} -d{PUSH_POW} -f -g{compiler} -H{self.tempdir.name} -n{SIM_NAME} {optimized} -s{seed} -upush -Utest/ui/ -v{arch} -y{PUSH_POW}", + f"./salis.py load -g{compiler} -H{self.tempdir.name} -n{SIM_NAME} {optimized} -upush -Utest/ui/", ) for compiler in ["clang", "gcc"] for optimized in ["", "-o"] @@ -23,28 +23,28 @@ class TestRun(SalisTest): def cmds_v1(self): return self.cmds("55a", "v1") - def file_list_0(self): + def files_on_first_push(self): return [ - *self.file_list_new(TestRun.NAME), - os.path.join(self.tempdir.name, TestRun.NAME, "evas", f"evas-{2 ** TestRun.PUSH_POW:016x}"), + *self.files_on_new(SIM_NAME), + os.path.join(self.tempdir.name, SIM_NAME, "evas", f"evas-{2 ** PUSH_POW:016x}"), ] - def file_list_1(self): + def files_on_second_push(self): return [ - *self.file_list_0(), - os.path.join(self.tempdir.name, TestRun.NAME, "evas", f"evas-{2 * (2 ** TestRun.PUSH_POW):016x}"), + *self.files_on_first_push(), + os.path.join(self.tempdir.name, SIM_NAME, "evas", f"evas-{2 * (2 ** PUSH_POW):016x}"), ] def test_null(self): for cmd in self.cmds_null(): SalisTest.run_subprocess(cmd[0]) - self.assert_file_list_exists(self.file_list_0()) + self.assert_file_list_exists(self.files_on_first_push()) SalisTest.run_subprocess(cmd[1]) - self.assert_file_list_exists(self.file_list_1()) + self.assert_file_list_exists(self.files_on_second_push()) def test_v1(self): for cmd in self.cmds_v1(): SalisTest.run_subprocess(cmd[0]) - self.assert_file_list_exists(self.file_list_0()) + self.assert_file_list_exists(self.files_on_first_push()) SalisTest.run_subprocess(cmd[1]) - self.assert_file_list_exists(self.file_list_1()) + self.assert_file_list_exists(self.files_on_second_push()) |