1511311 - DeskopInstance and FennecInstance could override specified custom preferences

Status: RESOLVED FIXED

(Remote Protocol :: Marionette, enhancement, P1)

Description

[Henrik Skupin [:whimboo][⌚️UTC+2]]

Both classes in geckoinstance.py aren't able to set custom preferences because those are set by the base class, and then gets overwritten again by the constructor of both classes.

Geckoinstance:

https://searchfox.org/mozilla-central/rev/e22c0d152060f4f8d4ca8904094f15f65a1b6f93/testing/marionette/client/marionette_driver/geckoinstance.py#151-154

DesktopInstance:

https://searchfox.org/mozilla-central/rev/e22c0d152060f4f8d4ca8904094f15f65a1b6f93/testing/marionette/client/marionette_driver/geckoinstance.py#587

Setting preferences this way doesn't seem to work ideal, but I don't think that we should totally refactor that now. Instead make sure that both classes can set custom preferences.

What I only wonder is that we haven't noticed that yet!

Comment 1

[Henrik Skupin [:whimboo][⌚️UTC+2]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=70cc25cd6b7ba904a2aeb3fc63fc08b1c06c3100

Comment 2

[Henrik Skupin [:whimboo][⌚️UTC+2]]

Attachment: Bug 1511311 - [marionette] GeckoInstance classes should not overwrite already set custom preferences. r?ato

Custom preferences as passed into both classes via the constructor
are getting set in the base GeckoInstance class. But both the
DesktopInstance and FennecInstance classes could override those
custom preferences if they have the same preference set as
required preference. As such the custom preference doesn't have
any effect.

This patch allows both classes to override required prefs with
a different value.

Comment 3

[Henrik Skupin [:whimboo][⌚️UTC+2]]

(In reply to Henrik Skupin (:whimboo) from comment #1)
> https://treeherder.mozilla.org/#/
> jobs?repo=try&revision=70cc25cd6b7ba904a2aeb3fc63fc08b1c06c3100

The failures in the try build were caused by left-over commits from bug 1508726. We should actually land this patch first.

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/cd370c35d88d
[marionette] GeckoInstance classes should not overwrite already set custom preferences. r=automatedtester

Comment 5

[Cristina Coroiu [:ccoroiu]]

https://hg.mozilla.org/mozilla-central/rev/cd370c35d88d