summaryrefslogtreecommitdiffstats
path: root/testing/marionette
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:34:50 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:34:50 +0000
commitdef92d1b8e9d373e2f6f27c366d578d97d8960c6 (patch)
tree2ef34b9ad8bb9a9220e05d60352558b15f513894 /testing/marionette
parentAdding debian version 125.0.3-1. (diff)
downloadfirefox-def92d1b8e9d373e2f6f27c366d578d97d8960c6.tar.xz
firefox-def92d1b8e9d373e2f6f27c366d578d97d8960c6.zip
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/marionette')
-rw-r--r--testing/marionette/harness/marionette_harness/tests/unit/amosigned.xpibin0 -> 7460 bytes
-rw-r--r--testing/marionette/harness/marionette_harness/tests/unit/test_addons.py8
-rw-r--r--testing/marionette/harness/marionette_harness/tests/unit/webextension-signed.xpibin4221 -> 0 bytes
-rw-r--r--testing/marionette/harness/marionette_harness/www/addons/webextension-signed.xpibin4221 -> 0 bytes
4 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
new file mode 100644
index 0000000000..9e895dbbb4
--- /dev/null
+++ b/testing/marionette/harness/marionette_harness/tests/unit/amosigned.xpi
Binary files differ
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
deleted file mode 100644
index 5363911af1..0000000000
--- a/testing/marionette/harness/marionette_harness/tests/unit/webextension-signed.xpi
+++ /dev/null
Binary files differ
diff --git a/testing/marionette/harness/marionette_harness/www/addons/webextension-signed.xpi b/testing/marionette/harness/marionette_harness/www/addons/webextension-signed.xpi
deleted file mode 100644
index 5363911af1..0000000000
--- a/testing/marionette/harness/marionette_harness/www/addons/webextension-signed.xpi
+++ /dev/null
Binary files differ