wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1221187: testing/marionette: Adjust log levels to match new defaults; r=automatedtester

Browse Source
This commit is contained in:
Andreas Tolfsen 2016-01-03 17:19:59 +00:00
parent 5cbd4203f2
commit 5526b85f6d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testing/marionette/driver.js
View File

@ -666,14 +666,14 @@ GeckoDriver.prototype.setSessionCapabilities = function(newCaps) {
// clone, overwrite, and set
let caps = copy(this.sessionCapabilities);
caps = copy(newCaps, caps);
logger.config("Changing capabilities: " + JSON.stringify(caps));
this.sessionCapabilities = caps;
};
GeckoDriver.prototype.setUpProxy = function (proxy) {
logger.debug("Setup Proxy has been entered. Will attempt to setup the following proxy");
logger.debug("Proxy object contains " + JSON.stringify(proxy));
if (typeof proxy == "object" && proxy.hasOwnProperty("proxyType")) {
GeckoDriver.prototype.setUpProxy = function(proxy) {
logger.debug("User-provided proxy settings: " + JSON.stringify(proxy));
if (typeof proxy == "object" && proxy.hasOwnProperty("proxyType")) {
switch (proxy.proxyType.toUpperCase()) {
case "MANUAL":
Services.prefs.setIntPref("network.proxy.type", 1);
@ -712,7 +712,7 @@ GeckoDriver.prototype.setUpProxy = function (proxy) {
Services.prefs.setIntPref("network.proxy.type", 0);
}
} else {
throw new InvalidArgumentError("the value of 'proxy' should be an object");
throw new InvalidArgumentError("Value of 'proxy' should be an object");
}
};

3
testing/marionette/listener.js
View File

@ -85,7 +85,7 @@ var cookies = new Cookies(() => curContainer.frame.document, chrome);
Cu.import("resource://gre/modules/Log.jsm");
var logger = Log.repository.getLogger("Marionette");
logger.info("loaded listener.js");
logger.debug("loaded listener.js");
var modalHandler = function() {
// This gets called on the system app only since it receives the mozbrowserprompt event
sendSyncMessage("Marionette:switchedToFrame", { frameValue: null, storePrevious: true });
@ -1907,7 +1907,6 @@ var _emu_cb_id = 0;
var _emu_cbs = {};
function runEmulatorCmd(cmd, callback) {
logger.info("listener runEmulatorCmd cmd=" + cmd);
if (callback) {
_emu_cbs[_emu_cb_id] = callback;
}