From 13bf7d4ff11e6897d4b688c16564f924e40f657e Mon Sep 17 00:00:00 2001
From: Peter Scheibel <scheibel1@llnl.gov>
Date: Thu, 24 Mar 2016 12:02:39 -0700
Subject: [PATCH] (1) move definition of MockCache to test command (no
 definitions or extra work is required in MockPackagesTest) (2) removing
 outdated logic (which originated in this branch) and minor cleanup

---
 lib/spack/spack/cmd/test.py                |  7 ++++++-
 lib/spack/spack/test/git_fetch.py          |  1 +
 lib/spack/spack/test/mock_packages_test.py | 13 -------------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/lib/spack/spack/cmd/test.py b/lib/spack/spack/cmd/test.py
index 1a025218146..3c405c5c6be 100644
--- a/lib/spack/spack/cmd/test.py
+++ b/lib/spack/spack/cmd/test.py
@@ -51,6 +51,11 @@ def setup_parser(subparser):
         help="verbose output")
 
 
+class MockCache(object):
+    def store(self, copyCmd, relativeDst):
+        pass
+
+
 def test(parser, args):
     if args.list:
         print "Available tests:"
@@ -67,5 +72,5 @@ def test(parser, args):
             
             if not os.path.exists(outputDir):
                 mkdirp(outputDir)
-        spack.cache = None
+        spack.cache = MockCache()
         spack.test.run(args.names, outputDir, args.verbose)
diff --git a/lib/spack/spack/test/git_fetch.py b/lib/spack/spack/test/git_fetch.py
index d3e1206c13b..35780441166 100644
--- a/lib/spack/spack/test/git_fetch.py
+++ b/lib/spack/spack/test/git_fetch.py
@@ -30,6 +30,7 @@
 from spack.test.mock_repo import MockGitRepo
 from spack.version import ver
 
+
 class GitFetchTest(MockPackagesTest):
     """Tests fetching from a dummy git repository."""
 
diff --git a/lib/spack/spack/test/mock_packages_test.py b/lib/spack/spack/test/mock_packages_test.py
index 06d7e7d4e14..6d24a84150b 100644
--- a/lib/spack/spack/test/mock_packages_test.py
+++ b/lib/spack/spack/test/mock_packages_test.py
@@ -34,8 +34,6 @@
 from spack.repository import RepoPath
 from spack.spec import Spec
 
-import llnl.util.tty as tty
-
 mock_compiler_config = """\
 compilers:
   all:
@@ -127,20 +125,9 @@ def cleanmock(self):
             pkg.dependencies.update(deps)
 
 
-    def rm_cache(self):
-        shutil.rmtree(spack.cache_path, ignore_errors=True)
-
-
     def setUp(self):
-        spack.cache = MockCache()
         self.initmock()
 
 
     def tearDown(self):
-        spack.cache = None
         self.cleanmock()
-        
-class MockCache(object):
-    def store(self, copyCmd, relativeDst):
-        tty.warn("Copying " + str(relativeDst))
-        pass