August 2014 - tbb-commits - lists.torproject.org

[tor-browser/esr24] Bug 1018414 - Skip test_error_codes.js on OS X. r=smaug, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 18a6858f8fe3af20919acdbfe97e40412d4d88e3 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Mon Jun 2 15:27:16 2014 -0400 Bug 1018414 - Skip test_error_codes.js on OS X. r=smaug, a=test-only --- content/base/test/unit/xpcshell.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/base/test/unit/xpcshell.ini b/content/base/test/unit/xpcshell.ini index 9d7c35d..f1ef2e6 100644 --- a/content/base/test/unit/xpcshell.ini +++ b/content/base/test/unit/xpcshell.ini @@ -8,6 +8,8 @@ tail = [test_csputils.js] [test_cspreports.js] [test_error_codes.js] +# Bug 1018414: hardcoded localhost doesn't work properly on some OS X installs +skip-if = os == 'mac' [test_thirdpartyutil.js] [test_xhr_standalone.js] [test_xmlserializer.js]

1 0

[tor-browser/esr24] Automated checkin: version bump for firefox 24.6.0esr release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit ebca3c103e7fe9416845f724879684bbcbd962c4 Author: ffxbld <none@none> Date: Mon Jun 9 21:01:00 2014 -0400 Automated checkin: version bump for firefox 24.6.0esr release. DONTBUILD CLOSED TREE a=release --- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/milestone.txt b/config/milestone.txt index 71e3ef9..c9dc647 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0 +24.6.0esrpre diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index 71e3ef9..c9dc647 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0 +24.6.0esrpre

1 0

[tor-browser/esr24] Bug 1018400 - Disable safebrowsing during reftests. r=ted, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 1891f376f6ae966d86818b891ef8b6bc250600f5 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Fri May 30 16:21:47 2014 -0400 Bug 1018400 - Disable safebrowsing during reftests. r=ted, a=test-only --- js/src/tests/user.js | 2 ++ layout/tools/reftest/runreftest.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/js/src/tests/user.js b/js/src/tests/user.js index 8849221..694d4d0 100755 --- a/js/src/tests/user.js +++ b/js/src/tests/user.js @@ -27,3 +27,5 @@ user_pref("javascript.options.werror", false); user_pref("toolkit.startup.max_resumed_crashes", -1); user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true); user_pref("toolkit.telemetry.enabled", false); +user_pref("browser.safebrowsing.enabled", false); +user_pref("browser.safebrowsing.malware.enabled", false); diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index 683b0a1..2bb3d11 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -74,6 +74,9 @@ class RefTest(object): # Ensure that telemetry is disabled, so we don't connect to the telemetry # server in the middle of the tests. prefsFile.write('user_pref("toolkit.telemetry.enabled", false);\n') + # Likewise for safebrowsing. + prefsFile.write('user_pref("browser.safebrowsing.enabled", false);\n') + prefsFile.write('user_pref("browser.safebrowsing.malware.enabled", false);\n') for v in options.extraPrefs: thispref = v.split("=")

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host bld-linux64-spot-050 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 44c7993368742ecc5b3c33c157f5fbc2490dda86 Author: ffxbld <none@none> Date: Sat Jun 14 03:08:31 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-050 - a=blocklist-update --- browser/app/blocklist.xml | 76 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 5 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 2039450..91763d3 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1400782040000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1402612020000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -274,6 +274,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i596" id="{b99c8534-7800-48fa-bd71-519a46cdc7e1}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i140" id="mozillahmpg(a)mozilla.org"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -413,6 +419,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}"> + <versionRange minVersion="0" maxVersion="*"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i111" os="WINNT" id="{C3949AC2-4B17-43ee-B4F1-D26B9D42404D}"> <versionRange minVersion="0" maxVersion="15.0.5" severity="1"> </versionRange> @@ -579,8 +591,26 @@ <prefs> </prefs> </emItem> - <emItem blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}"> - <versionRange minVersion="0" maxVersion="*"> + <emItem blockID="i618" id="toolbar(a)ask.com"> + <versionRange minVersion="3.15.5" maxVersion="3.15.5.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.8" maxVersion="3.15.8.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.10" maxVersion="3.15.11.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.13" maxVersion="3.15.13.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.18" maxVersion="3.15.20.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.22" maxVersion="3.15.22.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.24" maxVersion="3.15.24.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.26" maxVersion="3.15.26.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.28" maxVersion="3.15.28.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.31" maxVersion="3.15.31.*" severity="1"> </versionRange> <prefs> </prefs> @@ -666,6 +696,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i620" id="{21EAF666-26B3-4A3C-ABD0-CA2F5A326744}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i552" id="jid0-O6MIff3eO5dIGf5Tcv8RsJDKxrs@jetpack"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -872,6 +908,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i588" id="quick_start(a)gmail.com"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i340" id="chiang(a)programmer.net"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -926,6 +968,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i598" id="{29b136c9-938d-4d3d-8df8-d649d9b74d02}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i286" id="{58bd07eb-0ee0-4df0-8121-dc9b693373df}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -1278,8 +1326,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i19" id="{46551EC9-40F0-4e47-8E18-8E5CF550CFB8}"> - <versionRange minVersion="1.1b1" maxVersion="1.1b1"> + <emItem blockID="i586" id="jid1-0xtMKhXFEs4jIg@jetpack"> + <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> <prefs> </prefs> @@ -1290,6 +1338,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i19" id="{46551EC9-40F0-4e47-8E18-8E5CF550CFB8}"> + <versionRange minVersion="1.1b1" maxVersion="1.1b1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i531" id="/^(4cb61367-efbf-4aa1-8e3a-7f776c9d5763@cdece6e9-b2ef-40a9-b178-291da9870c59\.com|0efc9c38-1ec7-49ed-8915-53a48b6b7600@e7f17679-2a42-4659-83c5-7ba961fdf75a\.com|6be3335b-ef79-4b0b-a0ba-b87afbc6f4ad@6bbb4d2e-e33e-4fa5-9b37-934f4fb50182\.com)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1410,6 +1464,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i590" id="{94cd2cc3-083f-49ba-a218-4cda4b4829fd}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i544" id="/^(93abedcf-8e3a-4d02-b761-d1441e437c09@243f129d-aee2-42c2-bcd1-48858e1c22fd\.com|9acfc440-ac2d-417a-a64c-f6f14653b712@09f9a966-9258-4b12-af32-da29bdcc28c5\.com|58ad0086-1cfb-48bb-8ad2-33a8905572bc@5715d2be-69b9-4930-8f7e-64bdeb961cfd\.com)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -2111,6 +2171,12 @@ <pluginItem blockID="p574"> <match name="filename" exp="NPDjVu\.plugin" /> <versionRange minVersion="0" maxVersion="6.1.1" severity="0" vulnerabilitystatus="1"></versionRange> </pluginItem> + <pluginItem blockID="p592"> + <match name="filename" exp="CiscoWebCommunicator\.plugin" /> <versionRange minVersion="0" maxVersion="3.0.5.99999999999999" severity="0" vulnerabilitystatus="1"></versionRange> + </pluginItem> + <pluginItem blockID="p594"> + <match name="filename" exp="npCiscoWebCommunicator\.dll" /> <versionRange minVersion="0" maxVersion="3.0.5.99999999999999" severity="0" vulnerabilitystatus="1"></versionRange> + </pluginItem> </pluginItems> <gfxItems>

1 0

[tor-browser/esr24] Automated checkin: version bump for thunderbird 24.5.0 release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 0a1739dd79858b1330c0e995f85da3a231104b30 Author: tbirdbld <none@none> Date: Thu Apr 24 11:52:32 2014 -0400 Automated checkin: version bump for thunderbird 24.5.0 release. DONTBUILD CLOSED TREE a=release --- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/milestone.txt b/config/milestone.txt index 3c59cb3..dbc95cf 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.5.0esrpre +24.5.0 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index 3c59cb3..dbc95cf 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.5.0esrpre +24.5.0

1 0

[tor-browser/esr24] Automated checkin: version bump for firefox 24.5.0esr release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit f5d107462c23081418999ca2e41f0a680d35e7d4 Author: ffxbld <none@none> Date: Mon Apr 21 19:00:36 2014 -0400 Automated checkin: version bump for firefox 24.5.0esr release. DONTBUILD CLOSED TREE a=release --- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 2781e2b..3bd5cba 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.4.0esrpre +24.5.0esrpre diff --git a/config/milestone.txt b/config/milestone.txt index c0110c9..3c59cb3 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.4.0 +24.5.0esrpre diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index c0110c9..3c59cb3 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.4.0 +24.5.0esrpre

1 0

[tor-browser/esr24] Bug 772823 - Focus the main test window before closing the newly opened window in order to work around an unknown focus manager bug. r=gavin, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 745f14404e5e5d7ee21e3d70b5f09fd1f1533907 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Thu Apr 17 10:59:10 2014 -0400 Bug 772823 - Focus the main test window before closing the newly opened window in order to work around an unknown focus manager bug. r=gavin, a=test-only --- docshell/test/chrome/mozFrameType_window.xul | 31 ++++++++++++++------------ 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/docshell/test/chrome/mozFrameType_window.xul b/docshell/test/chrome/mozFrameType_window.xul index 020e6f0..aa811c3 100644 --- a/docshell/test/chrome/mozFrameType_window.xul +++ b/docshell/test/chrome/mozFrameType_window.xul @@ -33,20 +33,23 @@ "iframe with mozFrameType='content' in chrome document is typeContent"); SimpleTest.executeSoon(function () { - // Wait for the window to be closed before finishing the test - let ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] - .getService(Components.interfaces.nsIWindowWatcher); - ww.registerNotification(function windowObs(subject, topic, data) { - if (topic == "domwindowclosed") { - ww.unregisterNotification(windowObs); - - SimpleTest.waitForFocus(function() { - SimpleTest.finish(); - }, opener); - } - }); - - window.close(); + // First focus the parent window and then close this one. + SimpleTest.waitForFocus(function() { + let ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] + .getService(Components.interfaces.nsIWindowWatcher); + ww.registerNotification(function windowObs(subject, topic, data) { + if (topic == "domwindowclosed") { + ww.unregisterNotification(windowObs); + + // Don't start the next test synchronously! + SimpleTest.executeSoon(function() { + SimpleTest.finish(); + }); + } + }); + + window.close(); + }, opener); }); } ]]></script>

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host bld-linux64-spot-333 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 02fe2535cbf3166ea6b4ee02d5f3efdbfff815f5 Author: ffxbld <none@none> Date: Sat Apr 26 03:13:14 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-333 - a=blocklist-update --- browser/app/blocklist.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 5f776e3..8de9f0f 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1396993434000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1398202482000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -182,7 +182,7 @@ <prefs> </prefs> </emItem> - <emItem blockID="i566" id="{77BEC163-D389-42c1-91A4-C758846296A5}"> + <emItem blockID="i491" id="{515b2424-5911-40bd-8a2c-bdb20286d8f5}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> @@ -1103,6 +1103,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i566" id="{77BEC163-D389-42c1-91A4-C758846296A5}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i533" id="extension(a)Fast_Free_Converter.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1121,8 +1127,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i491" id="{515b2424-5911-40bd-8a2c-bdb20286d8f5}"> - <versionRange minVersion="0" maxVersion="*" severity="1"> + <emItem blockID="i576" id="newmoz(a)facebook.com"> + <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> <prefs> </prefs>

1 0

[tor-browser/esr24] Bug 997820 - Disable telemetry in tests. r=ted, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 4fdb5662d96302066846bc29ba4c06f2633dd610 Author: Nathan Froyd <froydnj(a)gmail.com> Date: Fri Apr 18 11:03:00 2014 -0400 Bug 997820 - Disable telemetry in tests. r=ted, a=test-only --- js/src/tests/user.js | 2 +- layout/tools/reftest/runreftest.py | 4 ++++ testing/profiles/prefs_general.js | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/js/src/tests/user.js b/js/src/tests/user.js index a5c88b1..8849221 100755 --- a/js/src/tests/user.js +++ b/js/src/tests/user.js @@ -26,4 +26,4 @@ user_pref("javascript.options.strict", false); user_pref("javascript.options.werror", false); user_pref("toolkit.startup.max_resumed_crashes", -1); user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true); - +user_pref("toolkit.telemetry.enabled", false); diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index 88c3199..70323a7 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -71,6 +71,10 @@ class RefTest(object): prefsFile.write('user_pref("reftest.filter", %s);\n' % self.makeJSString(options.filter)) prefsFile.write('user_pref("reftest.focusFilterMode", %s);\n' % self.makeJSString(options.focusFilterMode)) + # Ensure that telemetry is disabled, so we don't connect to the telemetry + # server in the middle of the tests. + prefs['toolkit.telemetry.enabled'] = False + for v in options.extraPrefs: thispref = v.split("=") if len(thispref) < 2: diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js index 3032a65..44b29b1 100644 --- a/testing/profiles/prefs_general.js +++ b/testing/profiles/prefs_general.js @@ -141,3 +141,6 @@ user_pref("media.webaudio.legacy.AudioParam", true); user_pref("media.webaudio.legacy.BiquadFilterNode", true); user_pref("media.webaudio.legacy.PannerNode", true); user_pref("media.webaudio.legacy.OscillatorNode", true); + +// We want to collect telemetry, but we don't want to send in the results. +user_pref('toolkit.telemetry.server', 'https://%(server)s/telemetry-dummy/');

1 0

[tor-browser/esr24] Bug 997820 - Properly set the reftest pref on esr24. a=bustage
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 6317e1c9d1d835fffbbcb3a871d52681038de416 Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Tue Apr 29 10:50:52 2014 -0400 Bug 997820 - Properly set the reftest pref on esr24. a=bustage --- layout/tools/reftest/runreftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index 70323a7..683b0a1 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -73,7 +73,7 @@ class RefTest(object): # Ensure that telemetry is disabled, so we don't connect to the telemetry # server in the middle of the tests. - prefs['toolkit.telemetry.enabled'] = False + prefsFile.write('user_pref("toolkit.telemetry.enabled", false);\n') for v in options.extraPrefs: thispref = v.split("=")

1 0