Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 2 additions & 2 deletions tests/remote/test_devedition.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'),

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.

Changing the locale in the line above will make the test fail because the expected filename will still contain de. You need to run the tests locally to ensure that nothing will regress. It as well applies to most of the other tests as well. I'll trigger the CI tests so that you can compare.

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.

Hi @AnsahMohammad. Are you planning to push an update for this particular PR?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Hey, sorry for the delay,
Yes i'll try to make a push over this weekend

])
def test_release_scraper(tmpdir, args, url):
Expand All @@ -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'},
Expand Down
2 changes: 1 addition & 1 deletion tests/remote/test_fenix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
])
Expand Down
8 changes: 4 additions & 4 deletions tests/remote/test_firefox.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'},
Expand Down Expand Up @@ -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',
Expand All @@ -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):
Expand Down
6 changes: 3 additions & 3 deletions tests/remote/test_thunderbird.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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."""
Expand All @@ -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")
Expand Down