Backed out changeset d58fda39820b (bug 1364594) for failing Marionette's test_window_maximize.py TestWindowMaximize.test_maximize on Windows 8 x64. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 17 May 2017 17:54:47 +0200
changeset 358779 1f09b8e255ddf965d62a2cc0086ce08ed5e86ea9
parent 358778 0be21772f2f918bfbc7d3af0d776609fb333ae1e
child 358780 f74ec590a5343f603c2e070afa25743dd15df43d
push id31838
push userkwierso@gmail.com
push dateWed, 17 May 2017 20:32:10 +0000
treeherdermozilla-central@b133ec74e3d0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1364594
milestone55.0a1
backs outd58fda39820b7019e8364f033dab5183d939f678
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset d58fda39820b (bug 1364594) for failing Marionette's test_window_maximize.py TestWindowMaximize.test_maximize on Windows 8 x64. r=backout
testing/marionette/driver.js
testing/marionette/harness/marionette_harness/tests/unit/test_window_rect.py
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -1365,20 +1365,16 @@ GeckoDriver.prototype.getWindowRect = fu
  */
 GeckoDriver.prototype.setWindowRect = function* (cmd, resp) {
   assert.firefox()
   const win = assert.window(this.getCurrentWindow());
   assert.noUserPrompt(this.dialog);
 
   let {x, y, width, height} = cmd.parameters;
 
-  if (win.windowState == win.STATE_FULLSCREEN) {
-    win.document.exitFullscreen();
-  }
-
   if (height != null && width != null) {
     assert.positiveInteger(height);
     assert.positiveInteger(width);
 
     if (win.outerWidth != width && win.outerHeight != height) {
       yield new Promise(resolve => {
         // When the DOM resize event claims that it fires _after_ the document
         // view has been resized, it is lying.
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_window_rect.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_window_rect.py
@@ -125,19 +125,16 @@ class TestSize(MarionetteTestCase):
             start_size["height"] -= 1
         self.marionette.set_window_size(start_size["width"], start_size["height"])
 
         self.original_size = self.marionette.window_size
 
     def tearDown(self):
         self.marionette.set_window_size(
             self.original_size["width"], self.original_size["height"])
-        is_fullscreen = self.marionette.execute_script("return document.fullscreenElement;", sandbox=None)
-        if is_fullscreen:
-            self.marionette.fullscreen()
         super(MarionetteTestCase, self).tearDown()
 
     def test_get_types(self):
         size = self.marionette.window_size
         self.assertIn("width", size)
         self.assertIn("height", size)
         self.assertIsInstance(size["width"], int)
         self.assertIsInstance(size["height"], int)
@@ -188,18 +185,8 @@ class TestSize(MarionetteTestCase):
         self.assertGreaterEqual(new["width"], self.max["width"])
         self.assertGreaterEqual(new["height"], self.max["height"])
 
     def test_resize_to_available_screen_size(self):
         result = self.marionette.set_window_rect(width=self.max['width'],
                                                  height=self.max["height"])
         self.assertEqual(result["width"], self.max["width"])
         self.assertEqual(result["height"], self.max["height"])
-
-    def test_resize_while_fullscreen(self):
-        self.marionette.fullscreen()
-        result = self.marionette.set_window_rect(width=self.max["width"] - 100,
-                                                 height=self.max["height"] - 100)
-
-        self.assertTrue(self.marionette.execute_script("return window.fullscreenElement == null",
-                                                        sandbox=None))
-        self.assertEqual(result["width"], self.max["width"] - 100)
-        self.assertEqual(result["height"], self.max["height"] - 100)