From bdb1847769f960082b5e1a6b793bf332970e6848 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 9 Jan 2016 11:44:30 -0800 Subject: [PATCH 1/6] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1af9f0deab12 Author: Andreas Tolfsen Desc: Merge pull request #33634 from andreastt/bug_1234063 Bug 1234063 - Always specify sandbox for scripts to be executed; r=aus ======== https://hg.mozilla.org/integration/gaia-central/rev/f4d57b20047c Author: Andreas Tolfsen Desc: Bug 1234063 - Always specify sandbox for scripts to be executed; r=mhenretty All calls to the remote commands executeScript, executeAsyncScript, and executeJSScript will send the `sandbox` parameter that implicitly indicates to the Marionette server that the script must be evaluated inside a sandbox where changes to the global environment _does not_ have any lasting side-effects. This enables bug 1123506 to implement support for the WebDriver conformant approach. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 26a17529c2b7..4c95dfa860c4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "0e6160a58b41b48a8e4bb75ab9e722d9491251f4", + "git_revision": "260e51a4262f75341e037e583dfc8f6835b5ab31", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "378762c5cb465ea89edfa93dfe81aa1af3993572", + "revision": "1af9f0deab127d830bbd4e29651fed46614104f8", "repo_path": "integration/gaia-central" } From d005b8a5403a0906e2caba05dea24a71e9d34cbc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 9 Jan 2016 11:45:52 -0800 Subject: [PATCH 2/6] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index bfc3dd89e71b..d67d00cde8e8 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index cc0ec48279ed..4389fa7f1de8 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index b6e5131fd202..741ce6046fe6 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index c5c49bbec638..9a4c92ff2b3c 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 767b1a34e0cc..2cb641658343 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 589b0ab491f0..72d4f1b71617 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index b6e5131fd202..741ce6046fe6 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 03fa0595c53f..39412f823284 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 38bce68bdbd6..06af214f3db2 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 8148b95baed7..db4cde688dc0 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 263cbeb2a16e..dfcdb8584c84 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From b35b375e0a1d39450232f4c0ffe0906c314d4f67 Mon Sep 17 00:00:00 2001 From: Mantaroh Yoshinaga Date: Thu, 7 Jan 2016 18:43:00 -0500 Subject: [PATCH 3/6] Bug 1237183 - Modify implementation of reading preference. r=seanlin --- dom/tv/TVSimulatorService.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dom/tv/TVSimulatorService.js b/dom/tv/TVSimulatorService.js index 8b641e055fbb..1dbacda0cdd1 100644 --- a/dom/tv/TVSimulatorService.js +++ b/dom/tv/TVSimulatorService.js @@ -17,7 +17,6 @@ Cu.import("resource://gre/modules/Services.jsm"); const TV_SIMULATOR_DUMMY_DIRECTORY = "dummy"; const TV_SIMULATOR_DUMMY_FILE = "settings.json"; -const TV_SIMULATOR_MOCK_DATA = Services.prefs.getCharPref("dom.testing.tv_mock_data"); // See http://seanyhlin.github.io/TV-Manager-API/#idl-def-TVSourceType const TV_SOURCE_TYPES = ["dvb-t","dvb-t2","dvb-c","dvb-c2","dvb-s", @@ -51,16 +50,19 @@ TVSimulatorService.prototype = { return; } + // I try to load the testing mock data if related preference are already set. + // Otherwise, use to the simulation data from prefences. + // See /dom/tv/test/mochitest/head.js for more details. let settingStr = ""; try { - if (TV_SIMULATOR_MOCK_DATA) { - settingStr = TV_SIMULATOR_MOCK_DATA; - } else { - settingStr = this._getDummyData(); - } + settingStr = Services.prefs.getCharPref("dom.testing.tv_mock_data"); } catch(e) { - debug("Error occurred : " + e ); - return; + try { + settingStr = this._getDummyData(); + } catch(e) { + debug("TV Simulator service failed to load simulation data: " + e); + return; + } } let settingsObj; @@ -178,7 +180,7 @@ TVSimulatorService.prototype = { } // Sort the program according to the startTime - wrapChannelData.programs.sort(function(a, b) { + wrapChannelData.programs.sort(function(a, b) { return a.startTime - b.startTime; }); wrapTunerData.channels.set(channel.number, wrapChannelData); @@ -252,8 +254,8 @@ TVSimulatorService.prototype = { this._scanCompleteTimer = Cc["@mozilla.org/timer;1"] .createInstance(Ci.nsITimer); - rv = this._scanCompleteTimer.initWithCallback(this, 10, - Ci.nsITimer.TYPE_ONE_SHOT); + let rv = this._scanCompleteTimer.initWithCallback(this, 10, + Ci.nsITimer.TYPE_ONE_SHOT); return Cr.NS_OK; }, From 584426a02e65d292be16cdbdcf9ac0c6f18dc85c Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 8 Jan 2016 08:04:00 -0500 Subject: [PATCH 4/6] Bug 1235290 - Allow test_persistentdatablock_gonk.js to be longer. r=me --- b2g/components/test/unit/xpcshell.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/b2g/components/test/unit/xpcshell.ini b/b2g/components/test/unit/xpcshell.ini index 35b6261f2768..28083607147b 100644 --- a/b2g/components/test/unit/xpcshell.ini +++ b/b2g/components/test/unit/xpcshell.ini @@ -52,6 +52,9 @@ head = file_killswitch.js skip-if = ((toolkit != "gonk") || (toolkit == "gonk" && debug)) [test_persistentdatablock_gonk.js] +# can be slow because of what the test does, so let's give it some more time +# to avoid intermittents: bug 1235290 +requesttimeoutfactor = 2 head = file_persistentdatablock.js skip-if = (toolkit != "gonk") From 8ad25b96cd1ba017e8837947d2394dc260280fd4 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 8 Jan 2016 08:04:00 -0500 Subject: [PATCH 5/6] Bug 1144499 - Allow test_logshake_gonk.js to be longer. r=me --HG-- extra : histedit_source : d40b20d18aaf41451d5b0a10502c7880c0481da9 --- b2g/components/test/unit/xpcshell.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/b2g/components/test/unit/xpcshell.ini b/b2g/components/test/unit/xpcshell.ini index 28083607147b..36c5af5d868a 100644 --- a/b2g/components/test/unit/xpcshell.ini +++ b/b2g/components/test/unit/xpcshell.ini @@ -26,6 +26,9 @@ skip-if = toolkit != "gonk" [test_logshake.js] [test_logshake_gonk.js] +# can be slow because of what the test does, so let's give it some more time +# to avoid intermittents: bug 1144499 +requesttimeoutfactor = 2 head = head_logshake_gonk.js # only run on b2g builds due to requiring b2g-specific log files to exist skip-if = (toolkit != "gonk") From 0107add0d34006091cc61152ddc3a7e0b45542b3 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 8 Jan 2016 08:04:00 -0500 Subject: [PATCH 6/6] Bug 1212395 - Allow test_logcapture_gonk.js to be longer. r=me --- b2g/components/test/unit/xpcshell.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/b2g/components/test/unit/xpcshell.ini b/b2g/components/test/unit/xpcshell.ini index 36c5af5d868a..9716e7264f96 100644 --- a/b2g/components/test/unit/xpcshell.ini +++ b/b2g/components/test/unit/xpcshell.ini @@ -18,6 +18,9 @@ tail = [test_logcapture.js] [test_logcapture_gonk.js] +# can be slow because of what the test does, so let's give it some more time +# to avoid intermittents: bug 1212395 +requesttimeoutfactor = 2 # only run on b2g builds due to requiring b2g-specific log files to exist skip-if = toolkit != "gonk"