From e1cf35a82b04bd31dff64c260a4a30c741217723 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 14 Oct 2019 01:40:20 -0700 Subject: Fix svn tests, skip if svnadmin not found (#13137) --- lib/spack/spack/test/mirror.py | 3 ++- lib/spack/spack/test/svn_fetch.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') 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']) -- cgit v1.2.3-70-g09d2