1524243 - Fix script_timeout regressions for Execute (Async) Script since the landing of bug 1510929

Status: RESOLVED FIXED

(Remote Protocol :: Marionette, defect, P1)

Description

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

Since bug 1510929 landed both the execute script and execute async script are broken in the following ways:

1. The custom timeout as set isn't reset if the script runs into a timeout

2. Fractions of a second are lost by script_timeout / 1000 because it's a decimal division. As such a timeout of 100ms will result in 0ms.

Comment 1

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

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

Comment 2

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

Attachment: Bug 1524243 - [marionette] Correctly handle script_timeout for WebDriver:{ExecuteScript,ExecuteAsyncScript}. r?jgraham

This fixes the following regressions as introduced by
bug 1510929 for the Marionette client.

1. The custom timeout as set isn't reset if the
   script times out.

2. Fractions of a second for the script timeout are
   lost because the division operates on decimal valus.
   As such a timeout of 100ms will result in 0ms.

Comment 3

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

Attachment: Bug 1524243 - [marionette] Correct calculation of timeout from milliseconds to seconds. r?jgraham

Fractions of a second are lost because the division
in getting the timeout value operates on decimal valus.
As such a timeout of 100ms will result in 0ms.

Depends on D18214

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/934099e1c866
[marionette] Correctly handle script_timeout for WebDriver:{ExecuteScript,ExecuteAsyncScript}. r=jgraham
https://hg.mozilla.org/integration/autoland/rev/71f896682a2f
[marionette] Correct calculation of timeout from milliseconds to seconds. r=jgraham

Comment 5

[Stefan Hindli [:stefan_hindli]]

https://hg.mozilla.org/mozilla-central/rev/934099e1c866
https://hg.mozilla.org/mozilla-central/rev/71f896682a2f

Comment 6

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

Please uplift the test-only patch to mozilla-beta to fix this regression.

Comment 7

[Bogdan Tara[:bogdan_tara | bogdant]]

:whimboo can you, please, point me to the test-only patch?

Comment 8

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/releases/mozilla-beta/rev/9cf59044f067
https://hg.mozilla.org/releases/mozilla-beta/rev/6eeb1301ae9f