From b6dc71143d557a63509aef42b08b7fdf293771f9 Mon Sep 17 00:00:00 2001 From: shubham-y Date: Sun, 9 May 2021 21:28:22 +0530 Subject: [PATCH 1/7] Changes for using json-automationrelevance instead of json-rev --- backend/code_coverage_backend/hgmo.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/code_coverage_backend/hgmo.py b/backend/code_coverage_backend/hgmo.py index 104f04aa6..2e37c99c5 100644 --- a/backend/code_coverage_backend/hgmo.py +++ b/backend/code_coverage_backend/hgmo.py @@ -13,7 +13,9 @@ __hgmo: Dict[str, Tuple[int, float]] = {} -HGMO_REVISION_URL = "https://hg.mozilla.org/{repository}/json-rev/{revision}" +HGMO_REVISION_URL = ( + "https://hg.mozilla.org/{repository}/json-automationrelevance/{revision}" +) HGMO_PUSHES_URL = "https://hg.mozilla.org/{repository}/json-pushes" @@ -30,8 +32,8 @@ def hgmo_revision_details(repository, changeset): resp = requests.get(url) resp.raise_for_status() data = resp.json() - assert "pushid" in data, "Missing pushid" - out = data["pushid"], data["date"][0] + assert "pushid" in data["changesets"][-1], "Missing pushid" + out = data["changesets"][-1]["pushid"], data["changesets"][-1]["date"][0] # Store in cache __hgmo[key] = out From 7169f906f7833be2798a458567f4366c22a25869 Mon Sep 17 00:00:00 2001 From: shubham-y Date: Sun, 9 May 2021 22:49:05 +0530 Subject: [PATCH 2/7] code standard improvement --- backend/code_coverage_backend/hgmo.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/code_coverage_backend/hgmo.py b/backend/code_coverage_backend/hgmo.py index 2e37c99c5..9094a197c 100644 --- a/backend/code_coverage_backend/hgmo.py +++ b/backend/code_coverage_backend/hgmo.py @@ -31,9 +31,9 @@ def hgmo_revision_details(repository, changeset): url = HGMO_REVISION_URL.format(repository=repository, revision=changeset) resp = requests.get(url) resp.raise_for_status() - data = resp.json() - assert "pushid" in data["changesets"][-1], "Missing pushid" - out = data["changesets"][-1]["pushid"], data["changesets"][-1]["date"][0] + data = resp.json()["changesets"][-1] + assert "pushid" in data, "Missing pushid" + out = data["pushid"], data["date"][0] # Store in cache __hgmo[key] = out From 09f8ea1163c3b90e2b50755ee5147ce073ebfdb9 Mon Sep 17 00:00:00 2001 From: shubham-y Date: Sun, 16 May 2021 18:50:14 +0530 Subject: [PATCH 3/7] changes in mock_hgmo for json-automationrelevance --- backend/tests/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py index 4d3e8f7a8..9b63f6b0e 100644 --- a/backend/tests/conftest.py +++ b/backend/tests/conftest.py @@ -144,7 +144,7 @@ def mock_hgmo(): def _test_rev(request): # The push id is in the first 3 characters of the revision requested - revision = request.path_url[17:] + revision = request.path_url[33:] assert len(revision) == 32 resp = {"pushid": int(revision[:3]), "date": [time.time(), 0]} return (200, headers, json.dumps(resp)) @@ -185,7 +185,7 @@ def _test_pushes(request): with responses.RequestsMock(assert_all_requests_are_fired=False) as resps: resps.add_callback( responses.GET, - re.compile("https://hg.mozilla.org/(.+)/json-rev/(.+)"), + re.compile("https://hg.mozilla.org/(.+)/json-automationrelevance/(.+)"), callback=_test_rev, ) resps.add_callback( From ab47697240fc5215f52bac28294404bf09e1f7b5 Mon Sep 17 00:00:00 2001 From: Shubham Date: Thu, 29 Jul 2021 16:16:16 +0530 Subject: [PATCH 4/7] changes for handling missing changesets key --- backend/code_coverage_backend/hgmo.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/code_coverage_backend/hgmo.py b/backend/code_coverage_backend/hgmo.py index 9094a197c..090b53e94 100644 --- a/backend/code_coverage_backend/hgmo.py +++ b/backend/code_coverage_backend/hgmo.py @@ -31,9 +31,12 @@ def hgmo_revision_details(repository, changeset): url = HGMO_REVISION_URL.format(repository=repository, revision=changeset) resp = requests.get(url) resp.raise_for_status() - data = resp.json()["changesets"][-1] - assert "pushid" in data, "Missing pushid" - out = data["pushid"], data["date"][0] + if resp.json().get("changesets") is None: + out = -1, 1 + else: + data = resp.json()["changesets"][-1] + assert "pushid" in data, "Missing pushid" + out = data["pushid"], data["date"][0] # Store in cache __hgmo[key] = out From df0682d63e9e7eae64047f383007498169dc88e1 Mon Sep 17 00:00:00 2001 From: Shubham Date: Sun, 22 Aug 2021 16:27:43 +0530 Subject: [PATCH 5/7] added assertion changes for changesets key --- backend/code_coverage_backend/hgmo.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/backend/code_coverage_backend/hgmo.py b/backend/code_coverage_backend/hgmo.py index 090b53e94..98fbe6795 100644 --- a/backend/code_coverage_backend/hgmo.py +++ b/backend/code_coverage_backend/hgmo.py @@ -31,12 +31,10 @@ def hgmo_revision_details(repository, changeset): url = HGMO_REVISION_URL.format(repository=repository, revision=changeset) resp = requests.get(url) resp.raise_for_status() - if resp.json().get("changesets") is None: - out = -1, 1 - else: - data = resp.json()["changesets"][-1] - assert "pushid" in data, "Missing pushid" - out = data["pushid"], data["date"][0] + assert "changesets" in resp.json(), "Missing changesets" + data = resp.json()["changesets"][-1] + assert "pushid" in data, "Missing pushid" + out = data["pushid"], data["date"][0] # Store in cache __hgmo[key] = out From 7276fed0be54e4063e8b50d331bf10231d298f1b Mon Sep 17 00:00:00 2001 From: Shubham Date: Mon, 30 Aug 2021 20:55:03 +0530 Subject: [PATCH 6/7] added changes to response returned by _test_rev --- backend/tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py index 9b63f6b0e..69dda64e4 100644 --- a/backend/tests/conftest.py +++ b/backend/tests/conftest.py @@ -146,7 +146,7 @@ def _test_rev(request): # The push id is in the first 3 characters of the revision requested revision = request.path_url[33:] assert len(revision) == 32 - resp = {"pushid": int(revision[:3]), "date": [time.time(), 0]} + resp = {"changesets":[{"pushid": int(revision[:3]), "date": [time.time(), 0]}]} return (200, headers, json.dumps(resp)) def _changesets(push_id): From 10c432c9c5bf168e7cabd2a0a8b303a2c234930c Mon Sep 17 00:00:00 2001 From: Shubham Date: Mon, 30 Aug 2021 21:00:13 +0530 Subject: [PATCH 7/7] code standard improvement --- backend/tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py index 69dda64e4..e17430656 100644 --- a/backend/tests/conftest.py +++ b/backend/tests/conftest.py @@ -146,7 +146,7 @@ def _test_rev(request): # The push id is in the first 3 characters of the revision requested revision = request.path_url[33:] assert len(revision) == 32 - resp = {"changesets":[{"pushid": int(revision[:3]), "date": [time.time(), 0]}]} + resp = {"changesets": [{"pushid": int(revision[:3]), "date": [time.time(), 0]}]} return (200, headers, json.dumps(resp)) def _changesets(push_id):