diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /testing/marionette/harness/marionette_harness/tests | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/marionette/harness/marionette_harness/tests')
-rw-r--r-- | testing/marionette/harness/marionette_harness/tests/unit/amosigned.xpi | bin | 0 -> 7460 bytes | |||
-rw-r--r-- | testing/marionette/harness/marionette_harness/tests/unit/test_addons.py | 8 | ||||
-rw-r--r-- | testing/marionette/harness/marionette_harness/tests/unit/webextension-signed.xpi | bin | 4221 -> 0 bytes |
3 files changed, 4 insertions, 4 deletions
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/amosigned.xpi b/testing/marionette/harness/marionette_harness/tests/unit/amosigned.xpi Binary files differnew file mode 100644 index 0000000000..9e895dbbb4 --- /dev/null +++ b/testing/marionette/harness/marionette_harness/tests/unit/amosigned.xpi diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_addons.py b/testing/marionette/harness/marionette_harness/tests/unit/test_addons.py index 1552dc8d6f..52a4d0a9a1 100644 --- a/testing/marionette/harness/marionette_harness/tests/unit/test_addons.py +++ b/testing/marionette/harness/marionette_harness/tests/unit/test_addons.py @@ -90,11 +90,11 @@ class TestAddons(MarionetteTestCase): self.assertNotIn("{d3e7c1f1-2e35-4a49-89fe-9f46eb8abf0a}", self.all_addon_ids) def test_install_and_remove_signed_addon(self): - addon_path = os.path.join(here, "webextension-signed.xpi") + addon_path = os.path.join(here, "amosigned.xpi") addon_id = self.addons.install(addon_path) self.assertIn(addon_id, self.all_addon_ids) - self.assertEqual(addon_id, "{d3e7c1f1-2e35-4a49-89fe-9f46eb8abf0a}") + self.assertEqual(addon_id, "amosigned-xpi@tests.mozilla.org") self.addons.uninstall(addon_id) self.assertNotIn(addon_id, self.all_addon_ids) @@ -126,11 +126,11 @@ class TestAddons(MarionetteTestCase): def test_install_mixed_separator_windows(self): # Ensure the base path has only \ addon_path = here.replace("/", "\\") - addon_path += "/webextension-signed.xpi" + addon_path += "/amosigned.xpi" addon_id = self.addons.install(addon_path, temp=True) self.assertIn(addon_id, self.all_addon_ids) - self.assertEqual(addon_id, "{d3e7c1f1-2e35-4a49-89fe-9f46eb8abf0a}") + self.assertEqual(addon_id, "amosigned-xpi@tests.mozilla.org") self.addons.uninstall(addon_id) self.assertNotIn(addon_id, self.all_addon_ids) diff --git a/testing/marionette/harness/marionette_harness/tests/unit/webextension-signed.xpi b/testing/marionette/harness/marionette_harness/tests/unit/webextension-signed.xpi Binary files differdeleted file mode 100644 index 5363911af1..0000000000 --- a/testing/marionette/harness/marionette_harness/tests/unit/webextension-signed.xpi +++ /dev/null |