diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/mozharness/requirements.txt | 6 | ||||
| -rw-r--r-- | testing/profiles/prefs_general.js | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/testing/mozharness/requirements.txt b/testing/mozharness/requirements.txt index 632355c54..9314abfee 100644 --- a/testing/mozharness/requirements.txt +++ b/testing/mozharness/requirements.txt @@ -8,12 +8,12 @@ dulwich==0.8.7 hg-git==0.4.0 logilab-astng==0.24.2 logilab-common==0.59.0 -mercurial==3.7.3 +mercurial ~> 4.1.3 mock==1.0.1 nose==1.2.1 ordereddict==1.1 -paramiko==1.10.0 -pycrypto==2.6 +paramiko ~> 1.17.6 +pycrypto > 2.6.1 pyflakes==0.6.1 pylint==0.27.0 simplejson==2.1.1 diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js index d30ae89f5..515828d29 100644 --- a/testing/profiles/prefs_general.js +++ b/testing/profiles/prefs_general.js @@ -297,10 +297,6 @@ user_pref("browser.aboutHomeSnippets.updateUrl", "nonexistent://test"); user_pref("browser.newtabpage.directory.source", 'data:application/json,{"testing":1}'); user_pref("browser.newtabpage.directory.ping", ""); -// Ensure UITour won't hit the network -user_pref("browser.uitour.pinnedTabUrl", "http://%(server)s/uitour-dummy/pinnedTab"); -user_pref("browser.uitour.url", "http://%(server)s/uitour-dummy/tour"); - // Tell the search service we are running in the US. This also has the desired // side-effect of preventing our geoip lookup. user_pref("browser.search.isUS", true); |