diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2019-10-14 01:40:20 -0700 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2019-10-14 10:40:20 +0200 |
| commit | e1cf35a82b04bd31dff64c260a4a30c741217723 (patch) | |
| tree | 2dd9ba346ed8eea0cc0d7d6e38f35e8b7b32135d /lib | |
| parent | bdcf9ba5cd7af40c25009c2551d337eb80059379 (diff) | |
| download | spack-e1cf35a82b04bd31dff64c260a4a30c741217723.tar.gz spack-e1cf35a82b04bd31dff64c260a4a30c741217723.tar.bz2 spack-e1cf35a82b04bd31dff64c260a4a30c741217723.tar.xz spack-e1cf35a82b04bd31dff64c260a4a30c741217723.zip | |
Fix svn tests, skip if svnadmin not found (#13137)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/test/mirror.py | 3 | ||||
| -rw-r--r-- | lib/spack/spack/test/svn_fetch.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/spack/spack/test/mirror.py b/lib/spack/spack/test/mirror.py index a8697fd029..2f80bae408 100644 --- a/lib/spack/spack/test/mirror.py +++ b/lib/spack/spack/test/mirror.py @@ -109,7 +109,8 @@ def test_git_mirror(mock_git_repository): @pytest.mark.skipif( - not which('svn'), reason='requires subversion to be installed') + not which('svn') or not which('svnadmin'), + reason='requires subversion to be installed') def test_svn_mirror(mock_svn_repository): set_up_package('svn-test', mock_svn_repository, 'svn') check_mirror() diff --git a/lib/spack/spack/test/svn_fetch.py b/lib/spack/spack/test/svn_fetch.py index a915a82874..eb0d22ee7c 100644 --- a/lib/spack/spack/test/svn_fetch.py +++ b/lib/spack/spack/test/svn_fetch.py @@ -19,7 +19,8 @@ from spack.util.executable import which pytestmark = pytest.mark.skipif( - not which('svn'), reason='requires subversion to be installed') + not which('svn') or not which('svnadmin'), + reason='requires subversion to be installed') @pytest.mark.parametrize("type_of_test", ['default', 'rev0']) |