diff options
| author | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-18 20:35:10 -0400 |
|---|---|---|
| committer | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-18 20:35:10 -0400 |
| commit | af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec (patch) | |
| tree | 4aac6c4383fb9e279fccb13c65a4e44595fd4cf6 /testing/profiles | |
| parent | 40fc72376411587e7bf9985fb9545eca1c9aaa8e (diff) | |
| parent | 51722cd4fecb5c8c79a302f2771cad71535df5ea (diff) | |
| download | UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar.gz UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar.lz UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar.xz UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.zip | |
Merge branch 'master' into default-pref
Diffstat (limited to 'testing/profiles')
| -rw-r--r-- | testing/profiles/prefs_general.js | 15 |
1 files changed, 0 insertions, 15 deletions
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 |