Avoid interferring with other tests

easybuilders · Dec 5, 2023 · f16d111 · f16d111
1 parent c42c747
commit f16d111
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 35 deletions.
diff --git a/test/framework/easyconfigs/test_ecs/t/toy/toy-0.0-foss-2018a.eb b/test/framework/easyconfigs/test_ecs/t/toy/toy-0.0-foss-2018a.eb
diff --git a/test/framework/filetools.py b/test/framework/filetools.py
@@ -2401,7 +2401,7 @@ def test_index_functions(self):
         # test with specified path with and without trailing '/'s
         for path in [test_ecs, test_ecs + '/', test_ecs + '//']:
             index = ft.create_index(path)
-            self.assertEqual(len(index), 91)
+            self.assertEqual(len(index), 92)
 
             expected = [
                 os.path.join('b', 'bzip2', 'bzip2-1.0.6-GCC-4.9.2.eb'),

diff --git a/test/framework/options.py b/test/framework/options.py
@@ -2422,9 +2422,13 @@ def test_try(self):
 
         # Try changing only name or version of toolchain
         args.pop(0)  # Remove EC filename
+        foss_toy_ec = os.path.join(self.test_buildpath, 'toy-0.0-foss-2018a.eb')
+        copy_file(os.path.join(ecs_path, 't', 'toy', 'toy-0.0-gompi-2018a.eb'), foss_toy_ec)
+        write_file(foss_toy_ec, "toolchain['name'] = 'foss'", append=True)
+
         test_cases = [
             (['toy-0.0-gompi-2018a.eb', '--try-toolchain-name=intel'], 'toy/0.0-iimpi-2018a'),
-            (['toy-0.0-foss-2018a.eb', '--try-toolchain-name=intel'], 'toy/0.0-intel-2018a'),
+            ([foss_toy_ec, '--try-toolchain-name=intel'], 'toy/0.0-intel-2018a'),
             (['toy-0.0-gompi-2018a.eb', '--try-toolchain-version=2018b'], 'toy/0.0-gompi-2018b'),
         ]
         for extra_args, mod in test_cases: