diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-06-16 12:12:29 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-06-16 12:12:29 -0700 |
| commit | 005827ab234e4fdb8d8e298baa99573bb570e4c8 (patch) | |
| tree | dc643d5c9a43b72fb3928953510d93dfe8315625 | |
| parent | f60ae61652397c614b2e6100eb17dcdc5a99164b (diff) | |
| download | spack-005827ab234e4fdb8d8e298baa99573bb570e4c8.tar.gz spack-005827ab234e4fdb8d8e298baa99573bb570e4c8.tar.bz2 spack-005827ab234e4fdb8d8e298baa99573bb570e4c8.tar.xz spack-005827ab234e4fdb8d8e298baa99573bb570e4c8.zip | |
Replace 2.6-incompatible skipIf with a conditional.
- skipIf doesn't work with Python 2.6.
| -rw-r--r-- | lib/spack/spack/test/concretize.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py index 67b20b4084..ab201f406a 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -253,10 +253,14 @@ class ConcretizeTest(MockPackagesTest): self.assertFalse('externalprereq' in spec) 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): + # 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.concretize() self.assertEqual(spec['externalmodule'].external_module, 'external-module') @@ -272,7 +276,7 @@ class ConcretizeTest(MockPackagesTest): got_error = True self.assertTrue(got_error) - + def test_external_and_virtual(self): spec = Spec('externaltest') spec.concretize() |