Skip to content

Commit d704adb

Browse files
committed
Bug 1378191 - Use JSON to send capabilities in "Marionette:listenersAttached" r=automatedtester
By not using the JSON format when sending the capabilities to the frame script, the values cannot be correctly decoded. As result the capabilities will be reset to their default values for the listener, and can cause various failures. MozReview-Commit-ID: KaryoJiyd30 UltraBlame original commit: 67cc62be47593442fe4a57a30de20a6ad6f3502d
1 parent 5c84230 commit d704adb

File tree

2 files changed

+189
-16
lines changed

2 files changed

+189
-16
lines changed

testing/marionette/driver.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21390,6 +21390,10 @@ newSession
2139021390
this
2139121391
.
2139221392
capabilities
21393+
.
21394+
toJSON
21395+
(
21396+
)
2139321397
)
2139421398
;
2139521399
this

testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py

Lines changed: 185 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5316,38 +5316,35 @@
53165316
:
53175317

53185318
def
5319-
setUp
5319+
tearDown
53205320
(
53215321
self
53225322
)
53235323
:
53245324

5325-
super
5326-
(
5327-
TestPageLoadStrategy
53285325
self
5329-
)
53305326
.
5331-
setUp
5327+
marionette
5328+
.
5329+
delete_session
53325330
(
53335331
)
53345332

5335-
if
53365333
self
53375334
.
53385335
marionette
53395336
.
5340-
session
5341-
is
5342-
not
5343-
None
5344-
:
5345-
5337+
start_session
5338+
(
5339+
)
5340+
5341+
super
5342+
(
5343+
TestPageLoadStrategy
53465344
self
5345+
)
53475346
.
5348-
marionette
5349-
.
5350-
delete_session
5347+
tearDown
53515348
(
53525349
)
53535350

@@ -5358,6 +5355,14 @@
53585355
)
53595356
:
53605357

5358+
self
5359+
.
5360+
marionette
5361+
.
5362+
delete_session
5363+
(
5364+
)
5365+
53615366
self
53625367
.
53635368
marionette
@@ -5436,6 +5441,14 @@
54365441
)
54375442
:
54385443

5444+
self
5445+
.
5446+
marionette
5447+
.
5448+
delete_session
5449+
(
5450+
)
5451+
54395452
self
54405453
.
54415454
marionette
@@ -5519,6 +5532,14 @@
55195532
)
55205533
:
55215534

5535+
self
5536+
.
5537+
marionette
5538+
.
5539+
delete_session
5540+
(
5541+
)
5542+
55225543
self
55235544
.
55245545
marionette
@@ -5594,3 +5615,151 @@
55945615
slow
55955616
"
55965617
)
5618+
5619+
run_if_e10s
5620+
(
5621+
"
5622+
Requires
5623+
e10s
5624+
mode
5625+
enabled
5626+
"
5627+
)
5628+
5629+
def
5630+
test_strategy_after_remoteness_change
5631+
(
5632+
self
5633+
)
5634+
:
5635+
5636+
"
5637+
"
5638+
"
5639+
Bug
5640+
1378191
5641+
-
5642+
Reset
5643+
of
5644+
capabilities
5645+
after
5646+
listener
5647+
reload
5648+
"
5649+
"
5650+
"
5651+
5652+
self
5653+
.
5654+
marionette
5655+
.
5656+
delete_session
5657+
(
5658+
)
5659+
5660+
self
5661+
.
5662+
marionette
5663+
.
5664+
start_session
5665+
(
5666+
{
5667+
"
5668+
desiredCapabilities
5669+
"
5670+
:
5671+
{
5672+
"
5673+
pageLoadStrategy
5674+
"
5675+
:
5676+
"
5677+
eager
5678+
"
5679+
}
5680+
}
5681+
)
5682+
5683+
#
5684+
Trigger
5685+
a
5686+
remoteness
5687+
change
5688+
which
5689+
will
5690+
reload
5691+
the
5692+
listener
5693+
script
5694+
5695+
self
5696+
.
5697+
assertTrue
5698+
(
5699+
self
5700+
.
5701+
is_remote_tab
5702+
"
5703+
Initial
5704+
tab
5705+
doesn
5706+
'
5707+
t
5708+
have
5709+
remoteness
5710+
flag
5711+
set
5712+
"
5713+
)
5714+
5715+
self
5716+
.
5717+
marionette
5718+
.
5719+
navigate
5720+
(
5721+
"
5722+
about
5723+
:
5724+
robots
5725+
"
5726+
)
5727+
5728+
self
5729+
.
5730+
assertFalse
5731+
(
5732+
self
5733+
.
5734+
is_remote_tab
5735+
"
5736+
Tab
5737+
has
5738+
remoteness
5739+
flag
5740+
set
5741+
"
5742+
)
5743+
5744+
self
5745+
.
5746+
marionette
5747+
.
5748+
navigate
5749+
(
5750+
self
5751+
.
5752+
test_page_slow_resource
5753+
)
5754+
5755+
self
5756+
.
5757+
assertEqual
5758+
(
5759+
"
5760+
interactive
5761+
"
5762+
self
5763+
.
5764+
ready_state
5765+
)

0 commit comments

Comments
 (0)