diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9448e46..03ce2c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,6 +46,12 @@ jobs: brew install subversion mercurial if: matrix.os == 'macos-latest' + - name: Install dependencies (Ubuntu) + run: | + sudo apt-get update + sudo apt-get install -y subversion mercurial + if: startsWith(matrix.os, 'ubuntu') + - name: Test with pytest run: | pip install --upgrade .[test] diff --git a/test/list2.repos b/test/list2.repos index 96c7a58..be1dbe6 100644 --- a/test/list2.repos +++ b/test/list2.repos @@ -13,5 +13,5 @@ repositories: version: 5.8 svn/rev: type: svn - url: https://github.com/ros-infrastructure/vcs2l - version: 3 + url: https://svn.apache.org/repos/asf/subversion + version: 1928014 diff --git a/test/test_commands.py b/test/test_commands.py index 5b8a35c..6e0c225 100644 --- a/test/test_commands.py +++ b/test/test_commands.py @@ -19,7 +19,6 @@ os.path.dirname(os.path.dirname(__file__)), 'test_workspace' ) -CI = os.environ.get('CI') == 'true' # Travis CI / Github actions set: CI=true svn = which('svn') hg = which('hg') if svn: @@ -342,7 +341,6 @@ def test_validate(self): expected = get_expected_output('validate_bad') self.assertEqual(output, expected) - @unittest.skipIf(CI, 'Cannot run on CI') @unittest.skipIf(not svn, '`svn` was not found') @unittest.skipIf(not hg, '`hg` was not found') def test_validate_svn_and_hg(self): diff --git a/test/validate2.txt b/test/validate2.txt index 2dd9cbb..479c5e2 100644 --- a/test/validate2.txt +++ b/test/validate2.txt @@ -6,4 +6,4 @@ Found hg repository 'https://www.mercurial-scm.org/repo/hg-stable' with changese === hg/tag (hg) === Found hg repository 'https://www.mercurial-scm.org/repo/hg-stable' with changeset '5.8' === svn/rev (svn) === -Found svn repository 'https://github.com/ros-infrastructure/vcs2l' with revision '3' +Found svn repository 'https://svn.apache.org/repos/asf/subversion' with revision '1928014'