Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset f8c07a51e7ce (bug 1257526) for marionette failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-03-22 13:21:35 +01:00
parent dd50937aa3
commit 5d87e982dd
4 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
testing/marionette/driver.js
View File

@ -2583,9 +2583,6 @@ GeckoDriver.prototype.takeScreenshot = function(cmd, resp) {
* landscape-secondary.
*/
GeckoDriver.prototype.getScreenOrientation = function(cmd, resp) {
if (this.appName == "Firefox") {
throw new UnsupportedOperationError();
}
resp.body.value = this.getCurrentWindow().screen.mozOrientation;
};
@ -2601,10 +2598,6 @@ GeckoDriver.prototype.getScreenOrientation = function(cmd, resp) {
* and "portrait-secondary" as well as "landscape-secondary".
*/
GeckoDriver.prototype.setScreenOrientation = function(cmd, resp) {
if (this.appName == "Firefox") {
throw new UnsupportedOperationError();
}
const ors = [
"portrait", "landscape",
"portrait-primary", "landscape-primary",

1
testing/marionette/harness/marionette/__init__.py
View File

@ -11,7 +11,6 @@ from .marionette_test import (
MarionetteTestCase,
skip,
skip_if_b2g,
skip_if_desktop,
SkipTest,
skip_unless_protocol,
)

31
testing/marionette/harness/marionette/tests/unit/test_screen_orientation.py
View File

@ -1,26 +1,22 @@
# -*- fill-column: 100; comment-column: 100; -*-
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from marionette_driver import errors
from marionette import MarionetteTestCase, skip_if_b2g, skip_if_desktop
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from mozrunner.devices.emulator_screen import EmulatorScreen
default_orientation = "portrait-primary"
unknown_orientation = "Unknown screen orientation: %s"
class TestScreenOrientation(MarionetteTestCase):
def setUp(self):
MarionetteTestCase.setUp(self)
self.is_mobile = self.marionette.session_capabilities["platformName"] != "Firefox"
def tearDown(self):
if self.is_mobile:
self.marionette.set_orientation(default_orientation)
self.assertEqual(self.marionette.orientation, default_orientation, "invalid state")
MarionetteTestCase.tearDown(self)
super(MarionetteTestCase, self).tearDown()
@skip_if_desktop
def test_set_orientation_to_portrait_primary(self):
self.marionette.set_orientation("portrait-primary")
new_orientation = self.marionette.orientation
@ -30,7 +26,6 @@ class TestScreenOrientation(MarionetteTestCase):
emulator_orientation = self.marionette.emulator.screen.orientation
self.assertEqual(emulator_orientation, EmulatorScreen.SO_PORTRAIT_PRIMARY)
@skip_if_desktop
def test_set_orientation_to_landscape_primary(self):
self.marionette.set_orientation("landscape-primary")
new_orientation = self.marionette.orientation
@ -40,7 +35,6 @@ class TestScreenOrientation(MarionetteTestCase):
emulator_orientation = self.marionette.emulator.screen.orientation
self.assertEqual(emulator_orientation, EmulatorScreen.SO_LANDSCAPE_PRIMARY)
@skip_if_desktop
def test_set_orientation_to_portrait_secondary(self):
self.marionette.set_orientation("portrait-secondary")
new_orientation = self.marionette.orientation
@ -50,7 +44,6 @@ class TestScreenOrientation(MarionetteTestCase):
emulator_orientation = self.marionette.emulator.screen.orientation
self.assertEqual(emulator_orientation, EmulatorScreen.SO_PORTRAIT_SECONDARY)
@skip_if_desktop
def test_set_orientation_to_landscape_secondary(self):
self.marionette.set_orientation("landscape-secondary")
new_orientation = self.marionette.orientation
@ -60,7 +53,6 @@ class TestScreenOrientation(MarionetteTestCase):
emulator_orientation = self.marionette.emulator.screen.orientation
self.assertEqual(emulator_orientation, EmulatorScreen.SO_LANDSCAPE_SECONDARY)
@skip_if_desktop
def test_set_orientation_to_shorthand_portrait(self):
# Set orientation to something other than portrait-primary first, since the default is
# portrait-primary.
@ -75,7 +67,6 @@ class TestScreenOrientation(MarionetteTestCase):
emulator_orientation = self.marionette.emulator.screen.orientation
self.assertEqual(emulator_orientation, EmulatorScreen.SO_PORTRAIT_PRIMARY)
@skip_if_desktop
def test_set_orientation_to_shorthand_landscape(self):
self.marionette.set_orientation("landscape")
new_orientation = self.marionette.orientation
@ -85,23 +76,15 @@ class TestScreenOrientation(MarionetteTestCase):
emulator_orientation = self.marionette.emulator.screen.orientation
self.assertEqual(emulator_orientation, EmulatorScreen.SO_LANDSCAPE_PRIMARY)
@skip_if_desktop
def test_set_orientation_with_mixed_casing(self):
self.marionette.set_orientation("lAnDsCaPe")
new_orientation = self.marionette.orientation
self.assertEqual(new_orientation, "landscape-primary")
@skip_if_desktop
def test_set_invalid_orientation(self):
with self.assertRaisesRegexp(errors.MarionetteException, unknown_orientation % "cheese"):
with self.assertRaisesRegexp(MarionetteException, unknown_orientation % "cheese"):
self.marionette.set_orientation("cheese")
@skip_if_desktop
def test_set_null_orientation(self):
with self.assertRaisesRegexp(errors.MarionetteException, unknown_orientation % "null"):
with self.assertRaisesRegexp(MarionetteException, unknown_orientation % "null"):
self.marionette.set_orientation(None)
@skip_if_b2g
def test_unsupported_operation_on_desktop(self):
with self.assertRaises(errors.UnsupportedOperationException):
self.marionette.set_orientation("landscape-primary")

1
testing/marionette/harness/marionette/tests/unit/unit-tests.ini
View File

@ -134,6 +134,7 @@ disabled = "Bug 925688"
b2g = false
[test_chrome_async_finish.js]
[test_screen_orientation.py]
browser = false
[test_errors.py]
[test_execute_isolate.py]