diff --git a/testing/firefox-ui/harness/firefox_ui_harness/decorators.py b/testing/firefox-ui/harness/firefox_ui_harness/decorators.py deleted file mode 100644 index 597ca97541ec..000000000000 --- a/testing/firefox-ui/harness/firefox_ui_harness/decorators.py +++ /dev/null @@ -1,14 +0,0 @@ -# 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 import SkipTest -import os - - -def skip_under_xvfb(target): - def wrapper(self, *args, **kwargs): - if os.environ.get('MOZ_XVFB'): - raise SkipTest("Skipping due to running under xvfb") - return target(self, *args, **kwargs) - return wrapper diff --git a/testing/firefox-ui/tests/functional/locationbar/test_access_locationbar.py b/testing/firefox-ui/tests/functional/locationbar/test_access_locationbar.py index 335886d2a2e2..1cc003c21487 100644 --- a/testing/firefox-ui/tests/functional/locationbar/test_access_locationbar.py +++ b/testing/firefox-ui/tests/functional/locationbar/test_access_locationbar.py @@ -4,7 +4,6 @@ from marionette_driver import Wait -from firefox_ui_harness.decorators import skip_under_xvfb from firefox_puppeteer.testcases import FirefoxTestCase @@ -28,7 +27,6 @@ class TestAccessLocationBar(FirefoxTestCase): self.autocomplete_results = self.locationbar.autocomplete_results self.urlbar = self.locationbar.urlbar - @skip_under_xvfb def test_access_locationbar_history(self): # Open some local pages, then about:blank diff --git a/testing/firefox-ui/tests/functional/locationbar/test_escape_autocomplete.py b/testing/firefox-ui/tests/functional/locationbar/test_escape_autocomplete.py index d3d0c1513593..112b90f5659c 100644 --- a/testing/firefox-ui/tests/functional/locationbar/test_escape_autocomplete.py +++ b/testing/firefox-ui/tests/functional/locationbar/test_escape_autocomplete.py @@ -4,7 +4,6 @@ from marionette_driver import Wait -from firefox_ui_harness.decorators import skip_under_xvfb from firefox_puppeteer.testcases import FirefoxTestCase @@ -32,7 +31,6 @@ class TestEscapeAutocomplete(FirefoxTestCase): self.autocomplete_results.close(force=True) FirefoxTestCase.tearDown(self) - @skip_under_xvfb def test_escape_autocomplete(self): # Open some local pages def load_urls(): diff --git a/testing/firefox-ui/tests/functional/locationbar/test_favicon_in_autocomplete.py b/testing/firefox-ui/tests/functional/locationbar/test_favicon_in_autocomplete.py index 855d62cad1b8..e526781e53b2 100644 --- a/testing/firefox-ui/tests/functional/locationbar/test_favicon_in_autocomplete.py +++ b/testing/firefox-ui/tests/functional/locationbar/test_favicon_in_autocomplete.py @@ -4,7 +4,6 @@ from marionette_driver import Wait -from firefox_ui_harness.decorators import skip_under_xvfb from firefox_puppeteer.testcases import FirefoxTestCase @@ -35,7 +34,6 @@ class TestFaviconInAutocomplete(FirefoxTestCase): finally: FirefoxTestCase.tearDown(self) - @skip_under_xvfb def test_favicon_in_autocomplete(self): # Open the test page def load_urls(): diff --git a/testing/firefox-ui/tests/functional/locationbar/test_suggest_bookmarks.py b/testing/firefox-ui/tests/functional/locationbar/test_suggest_bookmarks.py index 6a45a52cba56..e5d43724e19f 100644 --- a/testing/firefox-ui/tests/functional/locationbar/test_suggest_bookmarks.py +++ b/testing/firefox-ui/tests/functional/locationbar/test_suggest_bookmarks.py @@ -4,7 +4,6 @@ from marionette_driver import By, Wait -from firefox_ui_harness.decorators import skip_under_xvfb from firefox_puppeteer.testcases import FirefoxTestCase @@ -43,7 +42,6 @@ class TestStarInAutocomplete(FirefoxTestCase): finally: FirefoxTestCase.tearDown(self) - @skip_under_xvfb def test_star_in_autocomplete(self): search_string = 'grants' diff --git a/testing/firefox-ui/tests/functional/security/test_dv_certificate.py b/testing/firefox-ui/tests/functional/security/test_dv_certificate.py index 85bfdde6fdc5..96866768cc89 100644 --- a/testing/firefox-ui/tests/functional/security/test_dv_certificate.py +++ b/testing/firefox-ui/tests/functional/security/test_dv_certificate.py @@ -4,7 +4,6 @@ from marionette_driver import Wait -from firefox_ui_harness.decorators import skip_under_xvfb from firefox_puppeteer.testcases import FirefoxTestCase @@ -26,7 +25,6 @@ class TestDVCertificate(FirefoxTestCase): finally: FirefoxTestCase.tearDown(self) - @skip_under_xvfb def test_dv_cert(self): with self.marionette.using_context('content'): self.marionette.navigate(self.url) diff --git a/testing/firefox-ui/tests/functional/security/test_ev_certificate.py b/testing/firefox-ui/tests/functional/security/test_ev_certificate.py index 9a55cc35c04d..15d4480c1740 100644 --- a/testing/firefox-ui/tests/functional/security/test_ev_certificate.py +++ b/testing/firefox-ui/tests/functional/security/test_ev_certificate.py @@ -4,7 +4,6 @@ from marionette_driver import Wait -from firefox_ui_harness.decorators import skip_under_xvfb from firefox_puppeteer.testcases import FirefoxTestCase @@ -26,7 +25,6 @@ class TestEVCertificate(FirefoxTestCase): finally: FirefoxTestCase.tearDown(self) - @skip_under_xvfb def test_ev_certificate(self): with self.marionette.using_context('content'): self.marionette.navigate(self.url) diff --git a/testing/firefox-ui/tests/functional/security/test_mixed_content_page.py b/testing/firefox-ui/tests/functional/security/test_mixed_content_page.py index 5d6f8c3fdf06..e7486872f799 100644 --- a/testing/firefox-ui/tests/functional/security/test_mixed_content_page.py +++ b/testing/firefox-ui/tests/functional/security/test_mixed_content_page.py @@ -4,7 +4,6 @@ from marionette_driver import Wait -from firefox_ui_harness.decorators import skip_under_xvfb from firefox_puppeteer.testcases import FirefoxTestCase @@ -23,7 +22,6 @@ class TestMixedContentPage(FirefoxTestCase): finally: FirefoxTestCase.tearDown(self) - @skip_under_xvfb def test_mixed_content(self): with self.marionette.using_context('content'): self.marionette.navigate(self.url) diff --git a/testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py b/testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py index e009a47cc24b..82c82df26e09 100644 --- a/testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py +++ b/testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py @@ -4,7 +4,6 @@ from marionette_driver import By, Wait -from firefox_ui_harness.decorators import skip_under_xvfb from firefox_puppeteer.testcases import FirefoxTestCase @@ -66,7 +65,6 @@ class TestMixedScriptContentBlocking(FirefoxTestCase): def expect_protection_disabled(self): self._expect_protection_status(False) - @skip_under_xvfb def test_mixed_content_page(self): with self.marionette.using_context('content'): self.marionette.navigate(self.url) diff --git a/testing/firefox-ui/tests/functional/security/test_no_certificate.py b/testing/firefox-ui/tests/functional/security/test_no_certificate.py index 4010256d1f27..4a96529c441a 100644 --- a/testing/firefox-ui/tests/functional/security/test_no_certificate.py +++ b/testing/firefox-ui/tests/functional/security/test_no_certificate.py @@ -6,7 +6,6 @@ from urlparse import urlparse from marionette_driver import expected, Wait -from firefox_ui_harness.decorators import skip_under_xvfb from firefox_puppeteer.testcases import FirefoxTestCase @@ -28,7 +27,6 @@ class TestNoCertificate(FirefoxTestCase): finally: FirefoxTestCase.tearDown(self) - @skip_under_xvfb def test_no_certificate(self): with self.marionette.using_context('content'): self.marionette.navigate(self.url) diff --git a/testing/firefox-ui/tests/functional/security/test_ssl_status_after_restart.py b/testing/firefox-ui/tests/functional/security/test_ssl_status_after_restart.py index b7a9d76bb497..e341f4097f01 100644 --- a/testing/firefox-ui/tests/functional/security/test_ssl_status_after_restart.py +++ b/testing/firefox-ui/tests/functional/security/test_ssl_status_after_restart.py @@ -5,7 +5,6 @@ from marionette_driver import Wait from marionette.marionette_test import skip_if_e10s -from firefox_ui_harness.decorators import skip_under_xvfb from firefox_puppeteer.testcases import FirefoxTestCase @@ -48,7 +47,6 @@ class TestSSLStatusAfterRestart(FirefoxTestCase): FirefoxTestCase.tearDown(self) @skip_if_e10s - @skip_under_xvfb def test_ssl_status_after_restart(self): for item in self.test_data: with self.marionette.using_context('content'): diff --git a/testing/firefox-ui/tests/puppeteer/test_toolbars.py b/testing/firefox-ui/tests/puppeteer/test_toolbars.py index a26bf2178bbd..eff277fc8325 100644 --- a/testing/firefox-ui/tests/puppeteer/test_toolbars.py +++ b/testing/firefox-ui/tests/puppeteer/test_toolbars.py @@ -5,7 +5,6 @@ from marionette_driver import expected, By, Wait from marionette_driver.errors import NoSuchElementException -from firefox_ui_harness.decorators import skip_under_xvfb from firefox_puppeteer.testcases import FirefoxTestCase @@ -152,7 +151,6 @@ class TestAutoCompleteResults(FirefoxTestCase): finally: FirefoxTestCase.tearDown(self) - @skip_under_xvfb def test_popup_elements(self): # TODO: This test is not very robust because it relies on the history # in the default profile. @@ -165,7 +163,6 @@ class TestAutoCompleteResults(FirefoxTestCase): self.assertEqual(visible_result_count, int(results.get_attribute('itemCount'))) - @skip_under_xvfb def test_close(self): self.browser.navbar.locationbar.urlbar.send_keys('a') Wait(self.marionette).until(lambda _: self.autocomplete_results.is_open) @@ -173,7 +170,6 @@ class TestAutoCompleteResults(FirefoxTestCase): # end up closing. self.autocomplete_results.close() - @skip_under_xvfb def test_force_close(self): self.browser.navbar.locationbar.urlbar.send_keys('a') Wait(self.marionette).until(lambda _: self.autocomplete_results.is_open) @@ -181,7 +177,6 @@ class TestAutoCompleteResults(FirefoxTestCase): # end up closing. self.autocomplete_results.close(force=True) - @skip_under_xvfb def test_matching_text(self): # The default profile always has links to mozilla.org. So multiple results # will be found with 'moz'. @@ -222,7 +217,6 @@ class TestIdentityPopup(FirefoxTestCase): finally: FirefoxTestCase.tearDown(self) - @skip_under_xvfb def test_elements(self): self.locationbar.open_identity_popup() @@ -262,7 +256,6 @@ class TestIdentityPopup(FirefoxTestCase): self.assertEqual(security.more_info_button.get_attribute('localName'), 'button') - @skip_under_xvfb def test_open_close(self): with self.marionette.using_context('content'): self.marionette.navigate(self.url) @@ -274,7 +267,6 @@ class TestIdentityPopup(FirefoxTestCase): self.identity_popup.close() self.assertFalse(self.identity_popup.is_open) - @skip_under_xvfb def test_force_close(self): with self.marionette.using_context('content'): self.marionette.navigate(self.url)