Bug 1279370: Remove capabilities that we are meant for intermediary nodes. r?ato
The following capabilities should have been handled by the intermediary nodes
so we should just delete them before they cause any issues.
MozReview-Commit-ID: DGhirHSVYEa
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -576,16 +576,27 @@ GeckoDriver.prototype.setSessionCapabili
// Remove any duplicates between required and desired in favour of the
// required capabilities
if (from !== null && from.desiredCapabilities) {
for (let cap in from.requiredCapabilities) {
if (from.desiredCapabilities[cap]) {
delete from.desiredCapabilities[cap];
}
+
+ // Remove capabilities that we can't do anything about and that should
+ // have been sorted by the intermediary node.
+ if (["firefox_profile", "args", "binary"].indexOf(cap) > -1) {
+ try {
+ delete from.requiredCapabilities[cap]
+ } catch (e) {}
+ try {
+ delete from.desiredCapabilities[cap]
+ } catch (e) {}
+ }
}
// Let's remove the sessionCapabilities from desired capabilities
for (let cap in this.sessionCapabilities) {
if (from.desiredCapabilities && from.desiredCapabilities[cap]) {
delete from.desiredCapabilities[cap];
}
}