From 322d1984e80eb42860f235e40058a532e0ac2723 Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Wed, 12 Jun 2024 08:41:37 +0200 Subject: [PATCH 1/2] Move DevEdition remote tests from Firefox 60.0 to 128.0 (#689) --- tests/remote/test_devedition.py | 48 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/remote/test_devedition.py b/tests/remote/test_devedition.py index 61c29d79..ff69f9b2 100644 --- a/tests/remote/test_devedition.py +++ b/tests/remote/test_devedition.py @@ -16,18 +16,18 @@ @pytest.mark.ci_only @pytest.mark.parametrize("args,url", [ - ({'application': 'devedition', 'platform': 'linux', 'version': '60.0b1'}, - 'devedition/releases/60.0b1/linux-i686/en-US/firefox-60.0b1.tar.bz2'), - ({'application': 'devedition', 'platform': 'linux64', 'version': '60.0b1'}, - 'devedition/releases/60.0b1/linux-x86_64/en-US/firefox-60.0b1.tar.bz2'), - ({'application': 'devedition', 'platform': 'mac', 'version': '60.0b1'}, - 'devedition/releases/60.0b1/mac/en-US/Firefox 60.0b1.dmg'), - ({'application': 'devedition', 'platform': 'win32', 'version': '60.0b1'}, - 'devedition/releases/60.0b1/win32/en-US/Firefox Setup 60.0b1.exe'), - ({'application': 'devedition', 'platform': 'win64', 'version': '60.0b1'}, - 'devedition/releases/60.0b1/win64/en-US/Firefox Setup 60.0b1.exe'), - ({'application': 'devedition', 'platform': 'win32', 'version': '60.0b1', 'locale': 'de'}, - 'devedition/releases/60.0b1/win32/de/Firefox Setup 60.0b1.exe'), + ({'application': 'devedition', 'platform': 'linux', 'version': '128.0b1'}, + 'devedition/releases/128.0b1/linux-i686/en-US/firefox-128.0b1.tar.bz2'), + ({'application': 'devedition', 'platform': 'linux64', 'version': '128.0b1'}, + 'devedition/releases/128.0b1/linux-x86_64/en-US/firefox-128.0b1.tar.bz2'), + ({'application': 'devedition', 'platform': 'mac', 'version': '128.0b1'}, + 'devedition/releases/128.0b1/mac/en-US/Firefox 128.0b1.dmg'), + ({'application': 'devedition', 'platform': 'win32', 'version': '128.0b1'}, + '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'}, + 'devedition/releases/128.0b1/win32/de/Firefox Setup 128.0b1.exe'), ]) def test_release_scraper(tmpdir, args, url): """Test release scraper against the remote server.""" @@ -39,20 +39,20 @@ def test_release_scraper(tmpdir, args, url): @pytest.mark.ci_only @pytest.mark.parametrize("args,url", [ - ({'application': 'devedition', 'platform': 'linux', 'version': '60.0b1', 'build_number': 3}, - 'devedition/candidates/60.0b1-candidates/build3/linux-i686/en-US/firefox-60.0b1.tar.bz2'), - ({'application': 'devedition', 'platform': 'linux64', 'version': '60.0b1', 'build_number': 3}, - 'devedition/candidates/60.0b1-candidates/build3/linux-x86_64/en-US/firefox-60.0b1.tar.bz2'), # noqa - ({'application': 'devedition', 'platform': 'mac', 'version': '60.0b1', 'build_number': 3}, - 'devedition/candidates/60.0b1-candidates/build3/mac/en-US/Firefox 60.0b1.dmg'), - ({'application': 'devedition', 'platform': 'win32', 'version': '60.0b1', 'build_number': 3}, - 'devedition/candidates/60.0b1-candidates/build3/win32/en-US/Firefox Setup 60.0b1.exe'), - ({'application': 'devedition', 'platform': 'mac', 'version': '60.0b1', 'build_number': 3, + ({'application': 'devedition', 'platform': 'linux', 'version': '128.0b1', 'build_number': 1}, + 'devedition/candidates/128.0b1-candidates/build1/linux-i686/en-US/firefox-128.0b1.tar.bz2'), + ({'application': 'devedition', 'platform': 'linux64', 'version': '128.0b1', 'build_number': 1}, + 'devedition/candidates/128.0b1-candidates/build1/linux-x86_64/en-US/firefox-128.0b1.tar.bz2'), # noqa + ({'application': 'devedition', 'platform': 'mac', 'version': '128.0b1', 'build_number': 1}, + 'devedition/candidates/128.0b1-candidates/build1/mac/en-US/Firefox 128.0b1.dmg'), + ({'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'}, - 'devedition/candidates/60.0b1-candidates/build3/mac/de/Firefox 60.0b1.dmg'), - ({'application': 'devedition', 'platform': 'mac', 'version': '60.0b1', 'build_number': 3, + 'devedition/candidates/128.0b1-candidates/build1/mac/de/Firefox 128.0b1.dmg'), + ({'application': 'devedition', 'platform': 'mac', 'version': '128.0b1', 'build_number': 1, 'extension': 'json'}, - 'devedition/candidates/60.0b1-candidates/build3/mac/en-US/firefox-60.0b1.json'), + 'devedition/candidates/128.0b1-candidates/build1/mac/en-US/firefox-128.0b1.json'), ]) def test_candidate_scraper(tmpdir, args, url): """Test release candidate scraper against the remote server.""" From b06af14e987d0b9382109fb4b4451f7f3e405f3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 09:06:35 +0200 Subject: [PATCH 2/2] Bump pytest from 8.2.0 to 8.2.2 (#687) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.0 to 8.2.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.2.0...8.2.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Henrik Skupin --- requirements/tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/tests.txt b/requirements/tests.txt index b2946979..5eb9c850 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -1,5 +1,5 @@ coveralls[yaml]==4.0.0 -pytest==8.2.0 +pytest==8.2.2 pytest-cov==5.0.0 pytest-mock==3.14.0 wptserve==4.0.2