From 807e96807c679139fd4f19e5ea02ec755312d554 Mon Sep 17 00:00:00 2001 From: Andrei Eftimie Date: Thu, 27 Mar 2014 20:06:56 +0100 Subject: [PATCH] Bug 983642 - [tps] AddonRepository.getAddonsByIDs fails in mutiple tps tests. r=hskupin DONTBUILD --HG-- extra : rebase_source : 51ed8adff60cd7a0ddcd9c7c36a81f3510350089 --- .../api/restartless-xpi@tests.mozilla.org.xml} | 2 +- .../api/unsigned-xpi@tests.mozilla.org.xml} | 2 +- .../sync/tests/tps/{ => addons}/restartless.xpi | Bin services/sync/tests/tps/{ => addons}/unsigned.xpi | Bin testing/tps/tps/testrunner.py | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename services/sync/tests/tps/{restartless-xpi.xml => addons/api/restartless-xpi@tests.mozilla.org.xml} (90%) rename services/sync/tests/tps/{unsigned-xpi.xml => addons/api/unsigned-xpi@tests.mozilla.org.xml} (90%) rename services/sync/tests/tps/{ => addons}/restartless.xpi (100%) rename services/sync/tests/tps/{ => addons}/unsigned.xpi (100%) diff --git a/services/sync/tests/tps/restartless-xpi.xml b/services/sync/tests/tps/addons/api/restartless-xpi@tests.mozilla.org.xml similarity index 90% rename from services/sync/tests/tps/restartless-xpi.xml rename to services/sync/tests/tps/addons/api/restartless-xpi@tests.mozilla.org.xml index a6be2ecb420..6eb153ad191 100644 --- a/services/sync/tests/tps/restartless-xpi.xml +++ b/services/sync/tests/tps/addons/api/restartless-xpi@tests.mozilla.org.xml @@ -16,7 +16,7 @@ ALL - http://127.0.0.1:4567/restartless.xpi + http://127.0.0.1:4567/addons/restartless.xpi 2009-09-14T04:47:42Z diff --git a/services/sync/tests/tps/unsigned-xpi.xml b/services/sync/tests/tps/addons/api/unsigned-xpi@tests.mozilla.org.xml similarity index 90% rename from services/sync/tests/tps/unsigned-xpi.xml rename to services/sync/tests/tps/addons/api/unsigned-xpi@tests.mozilla.org.xml index 614927e77c0..14a056013b8 100644 --- a/services/sync/tests/tps/unsigned-xpi.xml +++ b/services/sync/tests/tps/addons/api/unsigned-xpi@tests.mozilla.org.xml @@ -16,7 +16,7 @@ ALL - http://127.0.0.1:4567/unsigned.xpi + http://127.0.0.1:4567/addons/unsigned.xpi 2009-09-14T04:47:42Z diff --git a/services/sync/tests/tps/restartless.xpi b/services/sync/tests/tps/addons/restartless.xpi similarity index 100% rename from services/sync/tests/tps/restartless.xpi rename to services/sync/tests/tps/addons/restartless.xpi diff --git a/services/sync/tests/tps/unsigned.xpi b/services/sync/tests/tps/addons/unsigned.xpi similarity index 100% rename from services/sync/tests/tps/unsigned.xpi rename to services/sync/tests/tps/addons/unsigned.xpi diff --git a/testing/tps/tps/testrunner.py b/testing/tps/tps/testrunner.py index a359ac90509..4d86e34c155 100644 --- a/testing/tps/tps/testrunner.py +++ b/testing/tps/tps/testrunner.py @@ -60,7 +60,7 @@ class TPSTestRunner(object): 'browser.warnOnQuit': False, # Allow installing extensions dropped into the profile folder 'extensions.autoDisableScopes': 10, - 'extensions.getAddons.get.url': 'http://127.0.0.1:4567/en-US/firefox/api/%API_VERSION%/search/guid:%IDS%', + 'extensions.getAddons.get.url': 'http://127.0.0.1:4567/addons/api/%IDS%.xml', 'extensions.update.enabled' : False, # Don't open a dialog to show available add-on updates 'extensions.update.notifyUser' : False,