From 1c4948e1b0cbcaa6d367152e21c6df7d53ebb945 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Mon, 27 Oct 2014 20:02:24 -0700 Subject: [PATCH] Fix long-standing multimethod test error. - New inclusive version ranges from git-fetching branch enable a fix. - Can now write :1 to include 1.3, 1.4, etc. - couldn't do this before so provides() was weird. --- lib/spack/spack/test/multimethod.py | 8 ++++---- var/spack/mock_packages/mpich/package.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/spack/spack/test/multimethod.py b/lib/spack/spack/test/multimethod.py index d7731134260..cd5d9e625e3 100644 --- a/lib/spack/spack/test/multimethod.py +++ b/lib/spack/spack/test/multimethod.py @@ -73,11 +73,11 @@ def test_mpi_version(self): def test_undefined_mpi_version(self): - # This currently fails because provides() doesn't do - # the right thing undefined version ranges. - # TODO: fix this. pkg = spack.db.get('multimethod^mpich@0.4') - self.assertEqual(pkg.mpi_version(), 0) + self.assertEqual(pkg.mpi_version(), 1) + + pkg = spack.db.get('multimethod^mpich@1.4') + self.assertEqual(pkg.mpi_version(), 1) def test_default_works(self): diff --git a/var/spack/mock_packages/mpich/package.py b/var/spack/mock_packages/mpich/package.py index e86c1a68ac6..75a939a8928 100644 --- a/var/spack/mock_packages/mpich/package.py +++ b/var/spack/mock_packages/mpich/package.py @@ -37,7 +37,7 @@ class Mpich(Package): version('3.0', 'foobarbaz') provides('mpi@:3', when='@3:') - provides('mpi@:1', when='@1:') + provides('mpi@:1', when='@:1') def install(self, spec, prefix): pass