From de75f133a7ec654d2a7c5bf628b3aee9fc109730 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 19 Apr 2019 02:02:56 +0200 Subject: Remove Firefox Accounts service and tie-ins. See previous commit for removal of browser identity module. --- testing/profiles/prefs_general.js | 15 --------------- .../runtimes/mochitest-browser-chrome-e10s.runtimes.json | 1 - testing/runtimes/mochitest-browser-chrome.runtimes.json | 1 - testing/talos/talos/config.py | 2 -- 4 files changed, 19 deletions(-) (limited to 'testing') diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js index bf1534c12..35680ca43 100644 --- a/testing/profiles/prefs_general.js +++ b/testing/profiles/prefs_general.js @@ -258,21 +258,6 @@ user_pref('toolkit.telemetry.server', 'https://%(server)s/telemetry-dummy/'); user_pref('toolkit.telemetry.test.pref1', true); user_pref('toolkit.telemetry.test.pref2', false); -// We don't want to hit the real Firefox Accounts server for tests. We don't -// actually need a functioning FxA server, so just set it to something that -// resolves and accepts requests, even if they all fail. -user_pref('identity.fxaccounts.auth.uri', 'https://%(server)s/fxa-dummy/'); - -// Ditto for all the other Firefox accounts URIs used for about:accounts et al.: -user_pref("identity.fxaccounts.remote.signup.uri", "https://%(server)s/fxa-signup"); -user_pref("identity.fxaccounts.remote.force_auth.uri", "https://%(server)s/fxa-force-auth"); -user_pref("identity.fxaccounts.remote.signin.uri", "https://%(server)s/fxa-signin"); -user_pref("identity.fxaccounts.settings.uri", "https://%(server)s/fxa-settings"); -user_pref('identity.fxaccounts.remote.webchannel.uri', 'https://%(server)s/'); - -// We don't want browser tests to perform FxA device registration. -user_pref('identity.fxaccounts.skipDeviceRegistration', true); - // Increase the APZ content response timeout in tests to 1 minute. // This is to accommodate the fact that test environments tends to be slower // than production environments (with the b2g emulator being the slowest of them diff --git a/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json b/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json index 211e98e05..8525931bd 100644 --- a/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json +++ b/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json @@ -76,7 +76,6 @@ "browser/base/content/test/general/browser_fullscreen-window-open.js": 4312, "browser/base/content/test/general/browser_fxa_oauth.js": 5410, "browser/base/content/test/general/browser_fxa_web_channel.js": 4727, - "browser/base/content/test/general/browser_fxaccounts.js": 2909, "browser/base/content/test/general/browser_getshortcutoruri.js": 3083, "browser/base/content/test/general/browser_identity_UI.js": 20930, "browser/base/content/test/general/browser_insecureLoginForms.js": 4482, diff --git a/testing/runtimes/mochitest-browser-chrome.runtimes.json b/testing/runtimes/mochitest-browser-chrome.runtimes.json index 73b2437a2..73efc2b26 100644 --- a/testing/runtimes/mochitest-browser-chrome.runtimes.json +++ b/testing/runtimes/mochitest-browser-chrome.runtimes.json @@ -82,7 +82,6 @@ "browser/base/content/test/general/browser_fullscreen-window-open.js": 2830, "browser/base/content/test/general/browser_fxa_oauth.js": 4120, "browser/base/content/test/general/browser_fxa_web_channel.js": 3535, - "browser/base/content/test/general/browser_fxaccounts.js": 3175, "browser/base/content/test/general/browser_getshortcutoruri.js": 3344, "browser/base/content/test/general/browser_identity_UI.js": 19308, "browser/base/content/test/general/browser_insecureLoginForms.js": 3538, diff --git a/testing/talos/talos/config.py b/testing/talos/talos/config.py index 59b6123d3..828e68a15 100644 --- a/testing/talos/talos/config.py +++ b/testing/talos/talos/config.py @@ -153,7 +153,6 @@ DEFAULTS = dict( 'browser.contentHandlers.types.3.uri': 'http://127.0.0.1/rss?url=%s', 'browser.contentHandlers.types.4.uri': 'http://127.0.0.1/rss?url=%s', 'browser.contentHandlers.types.5.uri': 'http://127.0.0.1/rss?url=%s', - 'identity.fxaccounts.auth.uri': 'https://127.0.0.1/fxa-dummy/', 'datareporting.healthreport.about.reportUrl': 'http://127.0.0.1/abouthealthreport/', 'datareporting.healthreport.documentServerURI': @@ -176,7 +175,6 @@ DEFAULTS = dict( 'devtools.debugger.remote-enabled': False, 'devtools.theme': "light", 'devtools.timeline.enabled': False, - 'identity.fxaccounts.migrateToDevEdition': False, 'media.libavcodec.allow-obsolete': True } ) -- cgit v1.2.3