Skip to content

Enable test run on mercurial and subversion #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leander-dsouza merged 3 commits into from
Aug 27, 2025
+9 −5
Merged

Enable test run on mercurial and subversion #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83d11dc
Fixed incorrect SVN URL with Apache Software Foundation repository.
leander-dsouza Aug 26, 2025
e47aac4
Enabled tests to run hvg and svn test cases.
leander-dsouza Aug 26, 2025
d66b826
Merge branch 'main' into leander-dsouza/fix-svn-test
leander-dsouza Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions test/list2.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@claraberendsen claraberendsen Aug 27, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For better understanding here could you explain were you are fetching this version number from?

@leander-dsouza leander-dsouza Aug 27, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The subversion repository link has the version mentioned as the revision tag.

image

2 changes: 0 additions & 2 deletions test/test_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@claraberendsen claraberendsen Aug 27, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be ok to drop since the only usage here is to skip the hg and svn test from running on CI environments.

@leander-dsouza leander-dsouza Aug 27, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel there is some merit in having the Mercurial and Subversion tests run on the CI.
This is also because the Vcstools PR #43 contains additional tests for hg and svn to be run in CI for validation.

svn = which('svn')
hg = which('hg')
if svn:
Expand Down Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion test/validate2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Loading