From 263c1311b7e5b1d92bfd2043057439d7a1efd53e Mon Sep 17 00:00:00 2001 From: William Lachance Date: Thu, 13 Feb 2020 17:37:43 -0500 Subject: [PATCH] Bug 1612627 - Make mozilla-central the initial integration branch This is especially important when bisecting the geckoview example app. --- mozregression/fetch_configs.py | 2 +- mozregression/json_pushes.py | 2 +- tests/unit/test_approx_persist.py | 2 +- tests/unit/test_build_info.py | 4 ++-- tests/unit/test_build_range.py | 2 +- tests/unit/test_fetch_configs.py | 14 +++++++------- tests/unit/test_json_pushes.py | 6 +++--- tests/unit/test_main.py | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mozregression/fetch_configs.py b/mozregression/fetch_configs.py index fd4dcfa1a..98ca151e8 100644 --- a/mozregression/fetch_configs.py +++ b/mozregression/fetch_configs.py @@ -316,7 +316,7 @@ class IntegrationConfigMixin(six.with_metaclass(ABCMeta)): """ Define the integration-related required configuration. """ - default_integration_branch = 'autoland' + default_integration_branch = 'mozilla-central' _tk_credentials = None @property diff --git a/mozregression/json_pushes.py b/mozregression/json_pushes.py index 48daf9bc5..5e4eaee6d 100644 --- a/mozregression/json_pushes.py +++ b/mozregression/json_pushes.py @@ -53,7 +53,7 @@ class JsonPushes(object): """ Find pushlog Push objects from a mozilla hg json-pushes api. """ - def __init__(self, branch='autoland'): + def __init__(self, branch='mozilla-central'): self.branch = branch self.repo_url = branches.get_url(branch) diff --git a/tests/unit/test_approx_persist.py b/tests/unit/test_approx_persist.py index 38242d52c..b8eb3c855 100644 --- a/tests/unit/test_approx_persist.py +++ b/tests/unit/test_approx_persist.py @@ -17,7 +17,7 @@ def create_build_range(values): def build_firefox_name(chset): - return ('%s-shippable--autoland--firefox-38.0a1.en-US.linux-x86_64.tar.bz2' + return ('%s-shippable--mozilla-central--firefox-38.0a1.en-US.linux-x86_64.tar.bz2' % chset) diff --git a/tests/unit/test_build_info.py b/tests/unit/test_build_info.py index 47529f537..d3b926ffb 100644 --- a/tests/unit/test_build_info.py +++ b/tests/unit/test_build_info.py @@ -31,7 +31,7 @@ def read_only(klass): defaults.extend([('repo_name', 'mozilla-central'), ('build_type', 'nightly')]) else: - defaults.extend([('repo_name', 'autoland'), + defaults.extend([('repo_name', 'mozilla-central'), ('build_type', 'integration')]) return [(klass, attr, value) for attr, value in defaults] @@ -107,7 +107,7 @@ def test_to_dict(klass): # same but for integration (build_info.IntegrationBuildInfo, {}, - '12ab12ab12ab-shippable--autoland--url'), + '12ab12ab12ab-shippable--mozilla-central--url'), ]) def test_persist_filename(klass, extra, result): persist_part = extra.pop('persist_part', None) diff --git a/tests/unit/test_build_range.py b/tests/unit/test_build_range.py index 70959c019..fc8dcb5cd 100644 --- a/tests/unit/test_build_range.py +++ b/tests/unit/test_build_range.py @@ -188,7 +188,7 @@ def test_get_integration_range(mocker): b_range = build_range.get_integration_range(fetch_config, 'a', 'e') - jpush_class.assert_called_once_with(branch='autoland') + jpush_class.assert_called_once_with(branch='mozilla-central') jpush.pushes_within_changes.assert_called_once_with('a', 'e') assert isinstance(b_range, build_range.BuildRange) assert len(b_range) == 3 diff --git a/tests/unit/test_fetch_configs.py b/tests/unit/test_fetch_configs.py index c34fd6323..78b800f3d 100644 --- a/tests/unit/test_fetch_configs.py +++ b/tests/unit/test_fetch_configs.py @@ -272,10 +272,10 @@ def test_fallback_routes(self): )) assert len(routes) == 3 assert routes[0] == ( - 'gecko.v2.autoland.revision.1a.firefox.linux64-opt' + 'gecko.v2.mozilla-central.revision.1a.firefox.linux64-opt' ) assert routes[2] == ( - 'gecko.v2.autoland.revision.1a.firefox.linux64-fallback' + 'gecko.v2.mozilla-central.revision.1a.firefox.linux64-fallback' ) @@ -318,11 +318,11 @@ def test_aarch64_build_types(self): 'gecko.v2.try.shippable.revision.%s.firefox.linux64-opt' % CHSET), # fennec ("fennec", None, None, None, None, TIMESTAMP_FENNEC_API_15 - 1, - 'gecko.v2.autoland.revision.%s.mobile.android-api-11-opt' % CHSET), + 'gecko.v2.mozilla-central.revision.%s.mobile.android-api-11-opt' % CHSET), ("fennec", None, None, None, None, TIMESTAMP_FENNEC_API_15, - 'gecko.v2.autoland.revision.%s.mobile.android-api-15-opt' % CHSET), + 'gecko.v2.mozilla-central.revision.%s.mobile.android-api-15-opt' % CHSET), ("fennec", None, None, None, None, TIMESTAMP_FENNEC_API_16, - 'gecko.v2.autoland.revision.%s.mobile.android-api-16-opt' % CHSET), + 'gecko.v2.mozilla-central.revision.%s.mobile.android-api-16-opt' % CHSET), ("fennec-2.3", None, None, None, 'm-i', TIMESTAMP_TEST, 'gecko.v2.mozilla-inbound.revision.%s.mobile.android-api-9-opt' % CHSET), # thunderbird @@ -341,9 +341,9 @@ def test_tk_route(app, os, bits, processor, repo, push_date, expected): @pytest.mark.parametrize("app,os,bits,processor,build_type,expected", [ # firefox ("firefox", 'linux', 64, 'x86_64', "asan", - 'gecko.v2.autoland.revision.%s.firefox.linux64-asan' % CHSET), + 'gecko.v2.mozilla-central.revision.%s.firefox.linux64-asan' % CHSET), ("firefox", 'linux', 64, 'x86_64', 'shippable', - 'gecko.v2.autoland.shippable.revision.%s.firefox.linux64-opt' + 'gecko.v2.mozilla-central.shippable.revision.%s.firefox.linux64-opt' % CHSET), ]) def test_tk_route_with_build_type(app, os, bits, processor, build_type, diff --git a/tests/unit/test_json_pushes.py b/tests/unit/test_json_pushes.py index ca664936d..58901f649 100644 --- a/tests/unit/test_json_pushes.py +++ b/tests/unit/test_json_pushes.py @@ -28,7 +28,7 @@ def test_push(mocker): assert push.utc_date == datetime(1970, 1, 2, 10, 17, 36) assert str(push) == 'c' retry_get.assert_called_once_with( - 'https://hg.mozilla.org/integration/autoland/json-pushes' + 'https://hg.mozilla.org/mozilla-central/json-pushes' '?changeset=validchangeset' ) @@ -76,9 +76,9 @@ def test_pushes_within_changes(mocker): assert pushes[2].changeset == 'c' retry_get.assert_has_calls([ - call('https://hg.mozilla.org/integration/autoland/json-pushes' + call('https://hg.mozilla.org/mozilla-central/json-pushes' '?changeset=fromchset'), - call('https://hg.mozilla.org/integration/autoland/json-pushes' + call('https://hg.mozilla.org/mozilla-central/json-pushes' '?fromchange=fromchset&tochange=tochset'), ]) diff --git a/tests/unit/test_main.py b/tests/unit/test_main.py index 25af44438..985f84350 100644 --- a/tests/unit/test_main.py +++ b/tests/unit/test_main.py @@ -169,7 +169,7 @@ def test_app_bisect_nightlies_user_exit(create_app, argv, expected_log, def test_app_bisect_integration_user_exit(create_app, mocker): Handler = mocker.patch("mozregression.main.IntegrationHandler") - Handler.return_value = Mock(build_range=[Mock(repo_name="autoland")], + Handler.return_value = Mock(build_range=[Mock(repo_name="mozilla-central")], good_revision='c1', bad_revision='c2', spec=IntegrationHandler) @@ -178,7 +178,7 @@ def test_app_bisect_integration_user_exit(create_app, mocker): app.bisector.bisect = Mock(return_value=Bisection.USER_EXIT) assert app.bisect_integration() == 0 assert create_app.find_in_log("To resume, run:") - assert create_app.find_in_log("--repo=autoland", False) + assert create_app.find_in_log("--repo=mozilla-central", False) def test_app_bisect_integration_no_data(create_app):