1 files changed, 32 insertions, 38 deletions

diff --git a/lib/spack/spack/test/package_class.py b/lib/spack/spack/test/package_class.py
index 909cf4193f..15fd1237fb 100644
--- a/lib/spack/spack/test/package_class.py
+++ b/lib/spack/spack/test/package_class.py
@@ -45,35 +45,32 @@ def mpileaks_possible_deps(mock_packages, mpi_names):
 
 
 def test_possible_dependencies(mock_packages, mpileaks_possible_deps):
-    mpileaks = spack.repo.get('mpileaks')
-    assert mpileaks_possible_deps == (
-        mpileaks.possible_dependencies(expand_virtuals=True))
-
+    pkg_cls = spack.repo.path.get_pkg_class('mpileaks')
+    expanded_possible_deps = pkg_cls.possible_dependencies(expand_virtuals=True)
+    assert mpileaks_possible_deps == expanded_possible_deps
     assert {
-        'callpath': set(['dyninst', 'mpi']),
-        'dyninst': set(['libdwarf', 'libelf']),
-        'libdwarf': set(['libelf']),
+        'callpath': {'dyninst', 'mpi'},
+        'dyninst': {'libdwarf', 'libelf'},
+        'libdwarf': {'libelf'},
         'libelf': set(),
         'mpi': set(),
-        'mpileaks': set(['callpath', 'mpi']),
-    } == mpileaks.possible_dependencies(expand_virtuals=False)
+        'mpileaks': {'callpath', 'mpi'},
+    } == pkg_cls.possible_dependencies(expand_virtuals=False)
 
 
 def test_possible_direct_dependencies(mock_packages, mpileaks_possible_deps):
-    mpileaks = spack.repo.get('mpileaks')
-    deps = mpileaks.possible_dependencies(transitive=False,
-                                          expand_virtuals=False)
-
+    pkg_cls = spack.repo.path.get_pkg_class('mpileaks')
+    deps = pkg_cls.possible_dependencies(transitive=False, expand_virtuals=False)
     assert {
         'callpath': set(),
         'mpi': set(),
-        'mpileaks': set(['callpath', 'mpi']),
+        'mpileaks': {'callpath', 'mpi'},
     } == deps
 
 
 def test_possible_dependencies_virtual(mock_packages, mpi_names):
     expected = dict(
-        (name, set(spack.repo.get(name).dependencies))
+        (name, set(spack.repo.path.get_pkg_class(name).dependencies))
         for name in mpi_names
     )
 
@@ -85,31 +82,29 @@ def test_possible_dependencies_virtual(mock_packages, mpi_names):
 
 
 def test_possible_dependencies_missing(mock_packages):
-    md = spack.repo.get("missing-dependency")
+    pkg_cls = spack.repo.path.get_pkg_class("missing-dependency")
     missing = {}
-    md.possible_dependencies(transitive=True, missing=missing)
-    assert set([
-        "this-is-a-missing-dependency"
-    ]) == missing["missing-dependency"]
+    pkg_cls.possible_dependencies(transitive=True, missing=missing)
+    assert {"this-is-a-missing-dependency"} == missing["missing-dependency"]
 
 
 def test_possible_dependencies_with_deptypes(mock_packages):
-    dtbuild1 = spack.repo.get('dtbuild1')
+    dtbuild1 = spack.repo.path.get_pkg_class('dtbuild1')
 
     assert {
-        'dtbuild1': set(['dtrun2', 'dtlink2']),
+        'dtbuild1': {'dtrun2', 'dtlink2'},
         'dtlink2': set(),
         'dtrun2': set(),
     } == dtbuild1.possible_dependencies(deptype=('link', 'run'))
 
     assert {
-        'dtbuild1': set(['dtbuild2', 'dtlink2']),
+        'dtbuild1': {'dtbuild2', 'dtlink2'},
         'dtbuild2': set(),
         'dtlink2': set(),
     } == dtbuild1.possible_dependencies(deptype=('build'))
 
     assert {
-        'dtbuild1': set(['dtlink2']),
+        'dtbuild1': {'dtlink2'},
         'dtlink2': set(),
     } == dtbuild1.possible_dependencies(deptype=('link'))
 
@@ -159,27 +154,26 @@ def setup_install_test(source_paths, install_test_root):
 ])
 def test_cache_extra_sources(install_mockery, spec, sources, extras, expect):
     """Test the package's cache extra test sources helper function."""
+    s = spack.spec.Spec(spec).concretized()
+    s.package.spec.concretize()
+    source_path = s.package.stage.source_path
 
-    pkg = spack.repo.get(spec)
-    pkg.spec.concretize()
-    source_path = pkg.stage.source_path
-
-    srcs = [fs.join_path(source_path, s) for s in sources]
-    setup_install_test(srcs, pkg.install_test_root)
+    srcs = [fs.join_path(source_path, src) for src in sources]
+    setup_install_test(srcs, s.package.install_test_root)
 
     emsg_dir = 'Expected {0} to be a directory'
     emsg_file = 'Expected {0} to be a file'
-    for s in srcs:
-        assert os.path.exists(s), 'Expected {0} to exist'.format(s)
-        if os.path.splitext(s)[1]:
-            assert os.path.isfile(s), emsg_file.format(s)
+    for src in srcs:
+        assert os.path.exists(src), 'Expected {0} to exist'.format(src)
+        if os.path.splitext(src)[1]:
+            assert os.path.isfile(src), emsg_file.format(src)
         else:
-            assert os.path.isdir(s), emsg_dir.format(s)
+            assert os.path.isdir(src), emsg_dir.format(src)
 
-    pkg.cache_extra_test_sources(extras)
+    s.package.cache_extra_test_sources(extras)
 
-    src_dests = [fs.join_path(pkg.install_test_root, s) for s in sources]
-    exp_dests = [fs.join_path(pkg.install_test_root, e) for e in expect]
+    src_dests = [fs.join_path(s.package.install_test_root, src) for src in sources]
+    exp_dests = [fs.join_path(s.package.install_test_root, e) for e in expect]
     poss_dests = set(src_dests) | set(exp_dests)
 
     msg = 'Expected {0} to{1} exist'