Skip to content

Commit 9613d9f

Browse files
committed
Avoid interferring with other tests
1 parent edde779 commit 9613d9f

File tree

3 files changed

+6
-35
lines changed

3 files changed

+6
-35
lines changed

test/framework/easyconfigs/test_ecs/t/toy/toy-0.0-foss-2018a.eb

Lines changed: 0 additions & 33 deletions
This file was deleted.

test/framework/filetools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2401,7 +2401,7 @@ def test_index_functions(self):
24012401
# test with specified path with and without trailing '/'s
24022402
for path in [test_ecs, test_ecs + '/', test_ecs + '//']:
24032403
index = ft.create_index(path)
2404-
self.assertEqual(len(index), 91)
2404+
self.assertEqual(len(index), 92)
24052405

24062406
expected = [
24072407
os.path.join('b', 'bzip2', 'bzip2-1.0.6-GCC-4.9.2.eb'),

test/framework/options.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2422,9 +2422,13 @@ def test_try(self):
24222422

24232423
# Try changing only name or version of toolchain
24242424
args.pop(0) # Remove EC filename
2425+
foss_toy_ec = os.path.join(self.test_buildpath, 'toy-0.0-foss-2018a.eb')
2426+
copy_file(os.path.join(ecs_path, 't', 'toy', 'toy-0.0-gompi-2018a.eb'), foss_toy_ec)
2427+
write_file(foss_toy_ec, "toolchain['name'] = 'foss'", append=True)
2428+
24252429
test_cases = [
24262430
(['toy-0.0-gompi-2018a.eb', '--try-toolchain-name=intel'], 'toy/0.0-iimpi-2018a'),
2427-
(['toy-0.0-foss-2018a.eb', '--try-toolchain-name=intel'], 'toy/0.0-intel-2018a'),
2431+
([foss_toy_ec, '--try-toolchain-name=intel'], 'toy/0.0-intel-2018a'),
24282432
(['toy-0.0-gompi-2018a.eb', '--try-toolchain-version=2018b'], 'toy/0.0-gompi-2018b'),
24292433
]
24302434
for extra_args, mod in test_cases:

0 commit comments

Comments
 (0)