summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2013-12-23 10:28:50 -0800
committerTodd Gamblin <tgamblin@llnl.gov>2013-12-23 10:28:50 -0800
commit358bfdaaf1e90c2ab06411ace68cb58b318f9ed7 (patch)
tree3f9cb43161b19de1132139732c061d0322f1ca74
parent87dc2151b77ce59c0fa8e0ab3dcacdc537192397 (diff)
downloadspack-358bfdaaf1e90c2ab06411ace68cb58b318f9ed7.tar.gz
spack-358bfdaaf1e90c2ab06411ace68cb58b318f9ed7.tar.bz2
spack-358bfdaaf1e90c2ab06411ace68cb58b318f9ed7.tar.xz
spack-358bfdaaf1e90c2ab06411ace68cb58b318f9ed7.zip
Another multimethod test for vdeps
-rw-r--r--lib/spack/spack/test/mock_packages/multimethod.py7
-rw-r--r--lib/spack/spack/test/multimethod.py10
2 files changed, 8 insertions, 9 deletions
diff --git a/lib/spack/spack/test/mock_packages/multimethod.py b/lib/spack/spack/test/mock_packages/multimethod.py
index fa8497eafc..e5c2f5243e 100644
--- a/lib/spack/spack/test/mock_packages/multimethod.py
+++ b/lib/spack/spack/test/mock_packages/multimethod.py
@@ -92,10 +92,9 @@ class Multimethod(Package):
#
# Make sure we can switch on virtual dependencies
#
- @when('^mpi@2:')
def different_by_virtual_dep(self):
- return 'mpi@2:'
+ return 1
- @when('^mpi@:1')
+ @when('^mpi@2:')
def different_by_virtual_dep(self):
- return 'mpi@:1'
+ return 2
diff --git a/lib/spack/spack/test/multimethod.py b/lib/spack/spack/test/multimethod.py
index 4627e06142..969c987da8 100644
--- a/lib/spack/spack/test/multimethod.py
+++ b/lib/spack/spack/test/multimethod.py
@@ -76,9 +76,9 @@ class MultiMethodTest(MockPackagesTest):
self.assertRaises(AmbiguousMethodError, pkg.different_by_dep)
- def test_one_dep_match(self):
- pass
+ def test_virtual_dep_match(self):
+ pkg = packages.get('multimethod^mpich2')
+ self.assertEqual(pkg.different_by_virtual_dep(), 2)
-
- def test_one_dep_match(self):
- pass
+ pkg = packages.get('multimethod^mpich@1.0')
+ self.assertEqual(pkg.different_by_virtual_dep(), 1)