hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace 2.6-incompatible skipIf with a conditional.

Browse source 
- skipIf doesn't work with Python 2.6.
This commit is contained in:
Todd Gamblin 2016-06-16 12:12:29 -07:00
parent f60ae61652
commit 005827ab23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/spack/spack/test/concretize.py
View file

@ -253,10 +253,14 @@ def test_external_package(self):
self.assertFalse('externalprereq' in spec) self.assertFalse('externalprereq' in spec)
self.assertTrue(spec['externaltool'].compiler.satisfies('gcc')) self.assertTrue(spec['externaltool'].compiler.satisfies('gcc'))
@unittest.skipIf(spack.architecture.sys_type().name == 'darwin' or
spack.architecture.sys_type().name == 'linux',
"No tcl modules on darwin/linux machines")
def test_external_package_module(self): def test_external_package_module(self):
# No tcl modules on darwin/linux machines
# TODO: improved way to check for this.
if (spack.architecture.sys_type().name == 'darwin' or
spack.architecture.sys_type().name == 'linux'):
return
spec = Spec('externalmodule') spec = Spec('externalmodule')
spec.concretize() spec.concretize()
self.assertEqual(spec['externalmodule'].external_module, 'external-module') self.assertEqual(spec['externalmodule'].external_module, 'external-module')