Bug 1302707 - Correct input types for timeout function; r?automatedtester
MozReview-Commit-ID: 9472W84MTGQ
--- a/testing/marionette/harness/marionette/marionette_test/testcases.py
+++ b/testing/marionette/harness/marionette/marionette_test/testcases.py
@@ -353,21 +353,21 @@ if (!testUtils.hasOwnProperty("specialPo
marionette.set_context(context)
if context != 'chrome':
marionette.navigate('data:text/html,<html>test page</html>')
timeout = JSTest.timeout_re.search(js)
if timeout:
timeout = timeout.group(3)
- marionette.set_script_timeout(timeout)
+ marionette.set_script_timeout(int(timeout))
inactivity_timeout = JSTest.inactivity_timeout_re.search(js)
if inactivity_timeout:
- inactivity_timeout = inactivity_timeout.group(3)
+ inactivity_timeout = int(inactivity_timeout.group(3))
try:
results = marionette.execute_js_script(
js,
args,
inactivity_timeout=inactivity_timeout,
filename=os.path.basename(filename)
)
--- a/testing/marionette/harness/marionette/tests/unit/test_implicit_waits.py
+++ b/testing/marionette/harness/marionette/tests/unit/test_implicit_waits.py
@@ -7,24 +7,24 @@ from marionette_driver.errors import NoS
from marionette_driver.by import By
class TestImplicitWaits(MarionetteTestCase):
def testShouldImplicitlyWaitForASingleElement(self):
test_html = self.marionette.absolute_url("test_dynamic.html")
self.marionette.navigate(test_html)
add = self.marionette.find_element(By.ID, "adder")
- self.marionette.set_search_timeout("30000")
+ self.marionette.set_search_timeout(30000)
add.click()
# All is well if this doesnt throw
self.marionette.find_element(By.ID, "box0")
def testShouldStillFailToFindAnElementWhenImplicitWaitsAreEnabled(self):
test_html = self.marionette.absolute_url("test_dynamic.html")
self.marionette.navigate(test_html)
- self.marionette.set_search_timeout("3000")
+ self.marionette.set_search_timeout(3000)
try:
self.marionette.find_element(By.ID, "box0")
self.fail("Should have thrown a a NoSuchElementException")
except NoSuchElementException:
pass
except Exception:
self.fail("Should have thrown a NoSuchElementException")