summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/spack/spack/cmd/test.py7
-rw-r--r--lib/spack/spack/test/git_fetch.py1
-rw-r--r--lib/spack/spack/test/mock_packages_test.py13
3 files changed, 7 insertions, 14 deletions
diff --git a/lib/spack/spack/cmd/test.py b/lib/spack/spack/cmd/test.py
index 1a02521814..3c405c5c6b 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 d3e1206c13..3578044116 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_packages_test import *
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 06d7e7d4e1..6d24a84150 100644
--- a/lib/spack/spack/test/mock_packages_test.py
+++ b/lib/spack/spack/test/mock_packages_test.py
@@ -34,8 +34,6 @@ from ordereddict_backport import OrderedDict
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 @@ class MockPackagesTest(unittest.TestCase):
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