From ba7ac53b75ed78553f9fb169ca53e659bd5ff0fb Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Dec 2019 18:05:08 -0600 Subject: Fix spack test when SPACK_ROOT isn't set (#13980) --- lib/spack/spack/test/util/util_url.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/test/util/util_url.py b/lib/spack/spack/test/util/util_url.py index 24b40ac63c..855491bfe6 100644 --- a/lib/spack/spack/test/util/util_url.py +++ b/lib/spack/spack/test/util/util_url.py @@ -6,6 +6,7 @@ """Test Spack's URL handling utility functions.""" import os import os.path +import spack.paths import spack.util.url as url_util @@ -41,7 +42,7 @@ def test_url_parse(): assert(parsed.netloc == 'path') assert(parsed.path == '/to/resource') - spack_root = os.path.abspath(os.environ['SPACK_ROOT']) + spack_root = spack.paths.spack_root parsed = url_util.parse('$spack') assert(parsed.scheme == 'file') assert(parsed.netloc == '') @@ -56,7 +57,7 @@ def test_url_parse(): def test_url_local_file_path(): - spack_root = os.path.abspath(os.environ['SPACK_ROOT']) + spack_root = spack.paths.spack_root lfp = url_util.local_file_path('/a/b/c.txt') assert(lfp == '/a/b/c.txt') @@ -171,7 +172,7 @@ def test_url_join_local_paths(): 'https://mirror.spack.io/build_cache/my-package') # file:// URL path components are *NOT* canonicalized - spack_root = os.path.abspath(os.environ['SPACK_ROOT']) + spack_root = spack.paths.spack_root join_result = url_util.join('/a/b/c', '$spack') assert(join_result == 'file:///a/b/c/$spack') # not canonicalized -- cgit v1.2.3-70-g09d2