Bug 846534 - Use a data url as the default WebAPI test page in Marionette, r=mdas
authorJonathan Griffin <jgriffin@mozilla.com>
Tue, 05 Mar 2013 13:23:41 -0800
changeset 123875 23a1dd29471f8336e18677141667de4625052ab0
parent 123874 c5a4010013edbf182b428442d3d114370806264a
child 123876 db2af0e84527a85607b7fe03c364441ccfaad516
push id1401
push userpastithas@mozilla.com
push dateThu, 07 Mar 2013 07:26:45 +0000
treeherderfx-team@ee4879719f78 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmdas
bugs846534
milestone22.0a1
Bug 846534 - Use a data url as the default WebAPI test page in Marionette, r=mdas
testing/marionette/client/marionette/marionette_test.py
testing/marionette/client/marionette/tests/unit/test_simpletest_pass.js
--- a/testing/marionette/client/marionette/marionette_test.py
+++ b/testing/marionette/client/marionette/marionette_test.py
@@ -196,18 +196,17 @@ class MarionetteJSTestCase(CommonTestCas
                     js += line
 
         context = self.context_re.search(js)
         if context:
             context = context.group(3)
             self.marionette.set_context(context)
 
         if context != "chrome":
-            page = self.marionette.absolute_url("empty.html")
-            self.marionette.navigate(page)
+            self.marionette.navigate('data:text/html,<html>test page</html>')
 
         timeout = self.timeout_re.search(js)
         if timeout:
             timeout = timeout.group(3)
             self.marionette.set_script_timeout(timeout)
 
         try:
             results = self.marionette.execute_js_script(js, args, special_powers=True)
--- a/testing/marionette/client/marionette/tests/unit/test_simpletest_pass.js
+++ b/testing/marionette/client/marionette/tests/unit/test_simpletest_pass.js
@@ -3,12 +3,10 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 MARIONETTE_TIMEOUT = 1000;
 
 is(2, 2, "test for is()");
 isnot(2, 3, "test for isnot()");
 ok(2 == 2, "test for ok()");
 
-is(window.location.pathname.slice(-10), "empty.html");
-
 setTimeout(finish, 100);