From a44a40cc8daf610b28bfe2895c9a0399d6c77b70 Mon Sep 17 00:00:00 2001 From: AnsahMohammad Date: Thu, 20 Feb 2025 19:45:05 +0530 Subject: [PATCH 1/2] fix: update locale tests from 'de' to 'fr' for improved stability --- tests/remote/test_devedition.py | 4 ++-- tests/remote/test_fenix.py | 2 +- tests/remote/test_firefox.py | 8 ++++---- tests/remote/test_thunderbird.py | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/remote/test_devedition.py b/tests/remote/test_devedition.py index 6eba1e5a..65efc32c 100644 --- a/tests/remote/test_devedition.py +++ b/tests/remote/test_devedition.py @@ -26,7 +26,7 @@ 'devedition/releases/128.0b1/win32/en-US/Firefox Setup 128.0b1.exe'), ({'application': 'devedition', 'platform': 'win64', 'version': '128.0b1'}, 'devedition/releases/128.0b1/win64/en-US/Firefox Setup 128.0b1.exe'), - ({'application': 'devedition', 'platform': 'win32', 'version': '128.0b1', 'locale': 'de'}, + ({'application': 'devedition', 'platform': 'win32', 'version': '128.0b1', 'locale': 'fr'}, 'devedition/releases/128.0b1/win32/de/Firefox Setup 128.0b1.exe'), ]) def test_release_scraper(tmpdir, args, url): @@ -49,7 +49,7 @@ def test_release_scraper(tmpdir, args, url): ({'application': 'devedition', 'platform': 'win32', 'version': '128.0b1', 'build_number': 1}, 'devedition/candidates/128.0b1-candidates/build1/win32/en-US/Firefox Setup 128.0b1.exe'), ({'application': 'devedition', 'platform': 'mac', 'version': '128.0b1', 'build_number': 1, - 'locale': 'de'}, + 'locale': 'fr'}, 'devedition/candidates/128.0b1-candidates/build1/mac/de/Firefox 128.0b1.dmg'), ({'application': 'devedition', 'platform': 'mac', 'version': '128.0b1', 'build_number': 1, 'extension': 'json'}, diff --git a/tests/remote/test_fenix.py b/tests/remote/test_fenix.py index 6d8aa10a..75095810 100644 --- a/tests/remote/test_fenix.py +++ b/tests/remote/test_fenix.py @@ -50,7 +50,7 @@ 'application': 'fenix', 'platform': 'android-x86_64', 'version': '123.0', - 'locale': 'de', + 'locale': 'fr', }, 'fenix/releases/123.0/android/fenix-123.0-android-x86_64/fenix-123.0.multi.android-x86_64.apk'), ]) diff --git a/tests/remote/test_firefox.py b/tests/remote/test_firefox.py index 7286ffaa..8a60144b 100644 --- a/tests/remote/test_firefox.py +++ b/tests/remote/test_firefox.py @@ -28,7 +28,7 @@ 'firefox/releases/42.0b2/win32/en-US/Firefox Setup 42.0b2.exe'), ({'application': 'firefox', 'platform': 'win64', 'version': '42.0b2'}, 'firefox/releases/42.0b2/win64/en-US/Firefox Setup 42.0b2.exe'), - ({'application': 'firefox', 'platform': 'win32', 'version': '42.0b2', 'locale': 'de'}, + ({'application': 'firefox', 'platform': 'win32', 'version': '42.0b2', 'locale': 'fr'}, 'firefox/releases/42.0b2/win32/de/Firefox Setup 42.0b2.exe'), ({'application': 'firefox', 'platform': 'win32', 'version': '42.0b2', 'is_stub_installer': True}, # old format @@ -57,7 +57,7 @@ def test_release_scraper(tmpdir, args, url): ({'application': 'firefox', 'platform': 'win32', 'version': '45.4.0esr', 'build_number': 1}, 'firefox/candidates/45.4.0esr-candidates/build1/win32/en-US/Firefox Setup 45.4.0esr.exe'), ({'application': 'firefox', 'platform': 'mac', 'version': '45.4.0esr', 'build_number': 1, - 'locale': 'de'}, + 'locale': 'fr'}, 'firefox/candidates/45.4.0esr-candidates/build1/mac/de/Firefox 45.4.0esr.dmg'), ({'application': 'firefox', 'platform': 'mac', 'version': '45.4.0esr', 'build_number': 1, 'extension': 'json'}, @@ -89,7 +89,7 @@ def test_candidate_scraper(tmpdir, args, url): {'branch': 'mozilla-central', 'platform': 'win32', 'date': '2015-10-21', 'build_number': 2}, {'branch': 'mozilla-central', 'platform': 'win32', 'build_id': '20151021065025'}, {'branch': 'mozilla-central', 'platform': 'linux', 'build_id': '20240106211805', - 'locale': 'de'}, + 'locale': 'fr'}, {'branch': 'mozilla-central', 'platform': 'win32', 'build_id': '20151021030212', 'extension': 'txt'}, {'branch': 'mozilla-central', 'platform': 'win32', 'build_id': '20151021030212', @@ -108,7 +108,7 @@ def test_daily_scraper(tmpdir, args): @pytest.mark.ci_only @pytest.mark.parametrize("args", [ {'branch': 'mozilla-central', 'platform': 'win32', 'debug_build': True}, - {'branch': 'mozilla-central', 'platform': 'win32', 'locale': 'de'}, + {'branch': 'mozilla-central', 'platform': 'win32', 'locale': 'fr'}, {'branch': 'mozilla-central', 'platform': 'win32', 'extension': 'txt'}, ]) def test_tinderbox_scraper(tmpdir, args): diff --git a/tests/remote/test_thunderbird.py b/tests/remote/test_thunderbird.py index 8b427101..dd30ff3f 100644 --- a/tests/remote/test_thunderbird.py +++ b/tests/remote/test_thunderbird.py @@ -24,7 +24,7 @@ 'thunderbird/releases/52.0/linux-x86_64/en-US/thunderbird-52.0.tar.bz2'), ({'application': 'thunderbird', 'platform': 'mac', 'version': '52.0'}, 'thunderbird/releases/52.0/mac/en-US/Thunderbird 52.0.dmg'), - ({'application': 'thunderbird', 'platform': 'win32', 'version': '52.0', 'locale': 'de'}, + ({'application': 'thunderbird', 'platform': 'win32', 'version': '52.0', 'locale': 'fr'}, 'thunderbird/releases/52.0/win32/de/Thunderbird Setup 52.0.exe'), ]) def test_release_scraper(tmpdir, args, url): @@ -77,7 +77,7 @@ def test_candidate_scraper(tmpdir, args, url): {'application': 'thunderbird', 'platform': 'linux', 'branch': 'comm-central', 'build_id': '20240102101857', 'extension': 'txt'}, {'application': 'thunderbird', 'platform': 'linux64', - 'branch': 'comm-central', 'build_id': '20240103103152', 'locale': 'de'}, + 'branch': 'comm-central', 'build_id': '20240103103152', 'locale': 'fr'}, ]) def test_daily_scraper(tmpdir, args): """Test daily scraper against the remote server.""" @@ -95,7 +95,7 @@ def test_daily_scraper(tmpdir, args): # Currently no debug builds are shipped for comm-central # {'application': 'thunderbird', 'branch': 'comm-central', 'platform': 'win32', 'debug_build': True}, # Test inappropriately causes an xpass even when it should fail - # {'application': 'thunderbird', 'branch': 'comm-central', 'platform': 'win32', 'locale': 'de'}, + # {'application': 'thunderbird', 'branch': 'comm-central', 'platform': 'win32', 'locale': 'fr'}, {'application': 'thunderbird', 'branch': 'comm-central', 'platform': 'win32', 'extension': 'txt'}, ]) @pytest.mark.xfail(strict=True, reason="tinderbox builds not available in the archive") From bbd4add45ca2c55bb006eed87376ae35c9eb4be4 Mon Sep 17 00:00:00 2001 From: AnsahMohammad Date: Sun, 16 Mar 2025 14:50:35 +0530 Subject: [PATCH 2/2] fix: update incorrect url and missing builds in test cases --- tests/remote/test_devedition.py | 4 ++-- tests/remote/test_firefox.py | 6 +++--- tests/remote/test_thunderbird.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/remote/test_devedition.py b/tests/remote/test_devedition.py index 65efc32c..e9cd6941 100644 --- a/tests/remote/test_devedition.py +++ b/tests/remote/test_devedition.py @@ -27,7 +27,7 @@ ({'application': 'devedition', 'platform': 'win64', 'version': '128.0b1'}, 'devedition/releases/128.0b1/win64/en-US/Firefox Setup 128.0b1.exe'), ({'application': 'devedition', 'platform': 'win32', 'version': '128.0b1', 'locale': 'fr'}, - 'devedition/releases/128.0b1/win32/de/Firefox Setup 128.0b1.exe'), + 'devedition/releases/128.0b1/win32/fr/Firefox Setup 128.0b1.exe'), ]) def test_release_scraper(tmpdir, args, url): """Test release scraper against the remote server.""" @@ -50,7 +50,7 @@ def test_release_scraper(tmpdir, args, url): 'devedition/candidates/128.0b1-candidates/build1/win32/en-US/Firefox Setup 128.0b1.exe'), ({'application': 'devedition', 'platform': 'mac', 'version': '128.0b1', 'build_number': 1, 'locale': 'fr'}, - 'devedition/candidates/128.0b1-candidates/build1/mac/de/Firefox 128.0b1.dmg'), + 'devedition/candidates/128.0b1-candidates/build1/mac/fr/Firefox 128.0b1.dmg'), ({'application': 'devedition', 'platform': 'mac', 'version': '128.0b1', 'build_number': 1, 'extension': 'json'}, 'devedition/candidates/128.0b1-candidates/build1/mac/en-US/firefox-128.0b1.json'), diff --git a/tests/remote/test_firefox.py b/tests/remote/test_firefox.py index 8a60144b..6b0be138 100644 --- a/tests/remote/test_firefox.py +++ b/tests/remote/test_firefox.py @@ -29,7 +29,7 @@ ({'application': 'firefox', 'platform': 'win64', 'version': '42.0b2'}, 'firefox/releases/42.0b2/win64/en-US/Firefox Setup 42.0b2.exe'), ({'application': 'firefox', 'platform': 'win32', 'version': '42.0b2', 'locale': 'fr'}, - 'firefox/releases/42.0b2/win32/de/Firefox Setup 42.0b2.exe'), + 'firefox/releases/42.0b2/win32/fr/Firefox Setup 42.0b2.exe'), ({'application': 'firefox', 'platform': 'win32', 'version': '42.0b2', 'is_stub_installer': True}, # old format 'firefox/releases/42.0b2/win32/en-US/Firefox Setup Stub 42.0b2.exe'), @@ -58,7 +58,7 @@ def test_release_scraper(tmpdir, args, url): 'firefox/candidates/45.4.0esr-candidates/build1/win32/en-US/Firefox Setup 45.4.0esr.exe'), ({'application': 'firefox', 'platform': 'mac', 'version': '45.4.0esr', 'build_number': 1, 'locale': 'fr'}, - 'firefox/candidates/45.4.0esr-candidates/build1/mac/de/Firefox 45.4.0esr.dmg'), + 'firefox/candidates/45.4.0esr-candidates/build1/mac/fr/Firefox 45.4.0esr.dmg'), ({'application': 'firefox', 'platform': 'mac', 'version': '45.4.0esr', 'build_number': 1, 'extension': 'json'}, 'firefox/candidates/45.4.0esr-candidates/build1/mac/en-US/firefox-45.4.0esr.json'), @@ -89,7 +89,7 @@ def test_candidate_scraper(tmpdir, args, url): {'branch': 'mozilla-central', 'platform': 'win32', 'date': '2015-10-21', 'build_number': 2}, {'branch': 'mozilla-central', 'platform': 'win32', 'build_id': '20151021065025'}, {'branch': 'mozilla-central', 'platform': 'linux', 'build_id': '20240106211805', - 'locale': 'fr'}, + 'locale': 'de'}, {'branch': 'mozilla-central', 'platform': 'win32', 'build_id': '20151021030212', 'extension': 'txt'}, {'branch': 'mozilla-central', 'platform': 'win32', 'build_id': '20151021030212', diff --git a/tests/remote/test_thunderbird.py b/tests/remote/test_thunderbird.py index dd30ff3f..9e448b95 100644 --- a/tests/remote/test_thunderbird.py +++ b/tests/remote/test_thunderbird.py @@ -25,7 +25,7 @@ ({'application': 'thunderbird', 'platform': 'mac', 'version': '52.0'}, 'thunderbird/releases/52.0/mac/en-US/Thunderbird 52.0.dmg'), ({'application': 'thunderbird', 'platform': 'win32', 'version': '52.0', 'locale': 'fr'}, - 'thunderbird/releases/52.0/win32/de/Thunderbird Setup 52.0.exe'), + 'thunderbird/releases/52.0/win32/fr/Thunderbird Setup 52.0.exe'), ]) def test_release_scraper(tmpdir, args, url): """Test release scraper against the remote server.""" @@ -77,7 +77,7 @@ def test_candidate_scraper(tmpdir, args, url): {'application': 'thunderbird', 'platform': 'linux', 'branch': 'comm-central', 'build_id': '20240102101857', 'extension': 'txt'}, {'application': 'thunderbird', 'platform': 'linux64', - 'branch': 'comm-central', 'build_id': '20240103103152', 'locale': 'fr'}, + 'branch': 'comm-central', 'build_id': '20240103103152', 'locale': 'de'}, ]) def test_daily_scraper(tmpdir, args): """Test daily scraper against the remote server.""" @@ -95,7 +95,7 @@ def test_daily_scraper(tmpdir, args): # Currently no debug builds are shipped for comm-central # {'application': 'thunderbird', 'branch': 'comm-central', 'platform': 'win32', 'debug_build': True}, # Test inappropriately causes an xpass even when it should fail - # {'application': 'thunderbird', 'branch': 'comm-central', 'platform': 'win32', 'locale': 'fr'}, + # {'application': 'thunderbird', 'branch': 'comm-central', 'platform': 'win32', 'locale': 'de'}, {'application': 'thunderbird', 'branch': 'comm-central', 'platform': 'win32', 'extension': 'txt'}, ]) @pytest.mark.xfail(strict=True, reason="tinderbox builds not available in the archive")