config: add .git to URLs for dev and stage, and test fixes (bug 1987822) (#74)

* config: add .git to URLs for dev and stage

This is what's coming in the lando messages, and matches the state of
the prod config.

* test_repo_synchronizer: fix test_sync_process (bug 1987822)

Remove the line-count assertion, as it was brittle and not testing
invariants we care about.

Author: shtrom

config-development.toml

@@ -21,10 +21,10 @@ directory = "/clones"
 
 [[tracked_repositories]]
 name = "ff-test"
-url = "https://github.com/mozilla-conduit/ff-test"
+url = "https://github.com/mozilla-conduit/ff-test.git"
 
 [[branch_mappings]]
-source_url = "https://github.com/mozilla-conduit/ff-test"
+source_url = "https://github.com/mozilla-conduit/ff-test.git"
 branch_pattern = "dev"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
 destination_branch = "default"
@@ -33,14 +33,14 @@ destination_branch = "default"
 # relbranches
 #
 [[branch_mappings]]
-source_url = "https://github.com/mozilla-conduit/ff-test"
+source_url = "https://github.com/mozilla-conduit/ff-test.git"
 # <M>_<m>_X RELBRANCH to mozilla-release matching branch
 branch_pattern = "^((FIREFOX|DEVEDITION|FIREFOX-ANDROID)_ESR_(\\d+)(_\\d+_X)_RELBRANCH)$"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
 destination_branch = "\\1"
 
 [[tag_mappings]]
-source_url = "https://github.com/mozilla-conduit/ff-test"
+source_url = "https://github.com/mozilla-conduit/ff-test.git"
 tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_.*$"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
 tags_destination_branch = "tags-unified-1973880"
@@ -49,16 +49,16 @@ tags_destination_branch = "tags-unified-1973880"
 
 [[tracked_repositories]]
 name = "test-repo-github"
-url = "https://github.com/mozilla-conduit/test-repo"
+url = "https://github.com/mozilla-conduit/test-repo.git"
 
 [[branch_mappings]]
-source_url = "https://github.com/mozilla-conduit/test-repo"
+source_url = "https://github.com/mozilla-conduit/test-repo.git"
 branch_pattern = "dev"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/test-repo-github-dev"
 destination_branch = "default"
 
 [[tag_mappings]]
-source_url = "https://github.com/mozilla-conduit/test-repo"
+source_url = "https://github.com/mozilla-conduit/test-repo.git"
 tag_pattern = "^(DEV)_(BETA|NIGHTLY)_(\\d+)_(BASE|END)$"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/test-repo-github-dev"
 tags_destination_branch = "tags-unified-1973880"

config-staging.toml

@@ -21,16 +21,16 @@ directory = "/clones"
 
 [[tracked_repositories]]
 name = "ff-test"
-url = "https://github.com/mozilla-conduit/ff-test"
+url = "https://github.com/mozilla-conduit/ff-test.git"
 
 [[branch_mappings]]
-source_url = "https://github.com/mozilla-conduit/ff-test"
+source_url = "https://github.com/mozilla-conduit/ff-test.git"
 branch_pattern = "stage"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-stage"
 destination_branch = "default"
 
 [[tag_mappings]]
-source_url = "https://github.com/mozilla-conduit/ff-test"
+source_url = "https://github.com/mozilla-conduit/ff-test.git"
 tag_pattern = "^(STAGE)_(BETA|NIGHTLY)_(\\d+)_(BASE|END)$"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-stage"
 tags_destination_branch = "stage-tags"
@@ -40,16 +40,16 @@ tags_destination_branch = "stage-tags"
 
 [[tracked_repositories]]
 name = "test-repo-github"
-url = "https://github.com/mozilla-conduit/test-repo"
+url = "https://github.com/mozilla-conduit/test-repo.git"
 
 [[branch_mappings]]
-source_url = "https://github.com/mozilla-conduit/test-repo"
+source_url = "https://github.com/mozilla-conduit/test-repo.git"
 branch_pattern = "stage"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/test-repo-github-stage"
 destination_branch = "default"
 
 [[tag_mappings]]
-source_url = "https://github.com/mozilla-conduit/test-repo"
+source_url = "https://github.com/mozilla-conduit/test-repo.git"
 tag_pattern = "^(STAGE)_(BETA|NIGHTLY)_(\\d+)_(BASE|END)$"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/test-repo-github-stage"
 tags_destination_branch = "stage-tags"

tests/test_repo_synchronizer.py

@@ -151,9 +151,6 @@ def test_sync_process(
         undo_log = undo.read()
         assert ".hgtags" in undo_log
         assert "bar.txt" not in undo_log
-        assert len(undo_log.strip().split("\n")) == 3, (
-            "An unexpected number of files was changed in the last push"
-        )
 
 
 def test_sync_process_duplicate_tags(