summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/spack/spack/provider_index.py (renamed from lib/spack/spack/virtual.py)0
-rw-r--r--lib/spack/spack/repository.py2
-rw-r--r--lib/spack/spack/spec.py15
-rw-r--r--lib/spack/spack/test/__init__.py5
-rw-r--r--lib/spack/spack/test/provider_index.py (renamed from lib/spack/spack/test/virtual.py)6
5 files changed, 16 insertions, 12 deletions
diff --git a/lib/spack/spack/virtual.py b/lib/spack/spack/provider_index.py
index 785ab98918..785ab98918 100644
--- a/lib/spack/spack/virtual.py
+++ b/lib/spack/spack/provider_index.py
diff --git a/lib/spack/spack/repository.py b/lib/spack/spack/repository.py
index 6aa9b8dd2f..3b0d3167b3 100644
--- a/lib/spack/spack/repository.py
+++ b/lib/spack/spack/repository.py
@@ -42,7 +42,7 @@ from llnl.util.filesystem import *
import spack.error
import spack.config
import spack.spec
-from spack.virtual import ProviderIndex
+from spack.provider_index import ProviderIndex
from spack.util.naming import *
#
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
index 24459fd3b3..8a47ec95ad 100644
--- a/lib/spack/spack/spec.py
+++ b/lib/spack/spack/spec.py
@@ -102,23 +102,26 @@ import sys
from StringIO import StringIO
from operator import attrgetter
+import yaml
+from yaml.error import MarkedYAMLError
+
import llnl.util.tty as tty
+from llnl.util.filesystem import join_path
+from llnl.util.lang import *
+from llnl.util.tty.color import *
+
import spack
import spack.architecture
import spack.compilers as compilers
import spack.error
import spack.parse
-import yaml
-from llnl.util.filesystem import join_path
-from llnl.util.lang import *
-from llnl.util.tty.color import *
from spack.build_environment import get_path_from_module, load_module
from spack.util.naming import mod_to_class
from spack.util.prefix import Prefix
from spack.util.string import *
from spack.version import *
-from spack.virtual import ProviderIndex
-from yaml.error import MarkedYAMLError
+from spack.provider_index import ProviderIndex
+
# Valid pattern for an identifier in Spack
identifier_re = r'\w[\w-]*'
diff --git a/lib/spack/spack/test/__init__.py b/lib/spack/spack/test/__init__.py
index 11f7298c04..e092a50913 100644
--- a/lib/spack/spack/test/__init__.py
+++ b/lib/spack/spack/test/__init__.py
@@ -32,6 +32,8 @@ from llnl.util.tty.colify import colify
from spack.test.tally_plugin import Tally
"""Names of tests to be included in Spack's test suite"""
+# All the tests Spack knows about.
+# Keep these one per line so that it's easy to see changes in diffs.
test_names = [
'architecture',
'build_system_guess',
@@ -74,11 +76,10 @@ test_names = [
'url_parse',
'url_substitution',
'versions',
- 'virtual',
+ 'provider_index',
'yaml',
]
-
def list_tests():
"""Return names of all tests that can be run for Spack."""
return test_names
diff --git a/lib/spack/spack/test/virtual.py b/lib/spack/spack/test/provider_index.py
index 1923e7006f..15fb9acff2 100644
--- a/lib/spack/spack/test/virtual.py
+++ b/lib/spack/spack/test/provider_index.py
@@ -26,15 +26,15 @@ from StringIO import StringIO
import unittest
import spack
-from spack.virtual import ProviderIndex
+from spack.provider_index import ProviderIndex
-class VirtualTest(unittest.TestCase):
+class ProviderIndexTest(unittest.TestCase):
def test_write_and_read(self):
p = ProviderIndex(spack.repo.all_package_names())
- ostream = StringIO ()
+ ostream = StringIO()
p.to_yaml(ostream)
istream = StringIO(ostream.getvalue())