Bug 1217046 - Move testcases from firefox_ui_harness into firefox_pup…

…peteer and firefox_ui_tests. r=whimboo (cherry picked from commit 50527c6)
mozilla · Oct 30, 2015 · afea285 · afea285
1 parent 9cac723
commit afea285
Show file tree

Hide file tree

Showing 41 changed files with 42 additions and 42 deletions.
diff --git a/firefox_puppeteer/testcases/__init__.py b/firefox_puppeteer/testcases/__init__.py
@@ -0,0 +1,5 @@
+# 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 base import FirefoxTestCase
diff --git a/firefox_ui_harness/testcases/base.py → firefox_puppeteer/testcases/base.py b/firefox_ui_harness/testcases/base.py → firefox_puppeteer/testcases/base.py
diff --git a/firefox_puppeteer/tests/test_about_window.py b/firefox_puppeteer/tests/test_about_window.py
@@ -4,7 +4,7 @@
 
 from marionette_driver import By
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestAboutWindow(FirefoxTestCase):

diff --git a/firefox_puppeteer/tests/test_appinfo.py b/firefox_puppeteer/tests/test_appinfo.py
@@ -5,7 +5,7 @@
 import mozversion
 from marionette_driver.errors import MarionetteException
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestAppInfo(FirefoxTestCase):

diff --git a/firefox_puppeteer/tests/test_l10n.py b/firefox_puppeteer/tests/test_l10n.py
@@ -6,7 +6,7 @@
 from marionette_driver.errors import MarionetteException
 
 from firefox_puppeteer.api.l10n import L10n
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestL10n(FirefoxTestCase):

diff --git a/firefox_puppeteer/tests/test_menubar.py b/firefox_puppeteer/tests/test_menubar.py
@@ -6,7 +6,7 @@
 
 from marionette_driver.errors import NoSuchElementException
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 @unittest.skip('Bug 1121710 - Fix MenuBar class for correct handling of menus')

diff --git a/firefox_puppeteer/tests/test_page_info_window.py b/firefox_puppeteer/tests/test_page_info_window.py
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_driver import By
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestPageInfoWindow(FirefoxTestCase):

diff --git a/firefox_puppeteer/tests/test_places.py b/firefox_puppeteer/tests/test_places.py
@@ -4,7 +4,7 @@
 
 from marionette_driver import By, Wait
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestPlaces(FirefoxTestCase):

diff --git a/firefox_puppeteer/tests/test_prefs.py b/firefox_puppeteer/tests/test_prefs.py
@@ -4,7 +4,7 @@
 
 from marionette_driver.errors import MarionetteException
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class testPreferences(FirefoxTestCase):

diff --git a/firefox_puppeteer/tests/test_security.py b/firefox_puppeteer/tests/test_security.py
@@ -2,7 +2,7 @@
 # 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 firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 from firefox_puppeteer.errors import NoCertificateError
 

diff --git a/firefox_puppeteer/tests/test_software_update.py b/firefox_puppeteer/tests/test_software_update.py
@@ -4,7 +4,7 @@
 
 import os
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 from firefox_puppeteer.api.software_update import SoftwareUpdate
 

diff --git a/firefox_puppeteer/tests/test_tabbar.py b/firefox_puppeteer/tests/test_tabbar.py
@@ -2,7 +2,7 @@
 # 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 firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 from firefox_puppeteer.errors import NoCertificateError
 

diff --git a/firefox_puppeteer/tests/test_toolbars.py b/firefox_puppeteer/tests/test_toolbars.py
@@ -6,7 +6,7 @@
 from marionette_driver.errors import NoSuchElementException
 
 from firefox_ui_harness.decorators import skip_under_xvfb
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestNavBar(FirefoxTestCase):

diff --git a/firefox_puppeteer/tests/test_update_wizard.py b/firefox_puppeteer/tests/test_update_wizard.py
@@ -4,7 +4,7 @@
 
 from firefox_puppeteer.ui.update_wizard import UpdateWizardDialog
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestUpdateWizard(FirefoxTestCase):

diff --git a/firefox_puppeteer/tests/test_windows.py b/firefox_puppeteer/tests/test_windows.py
@@ -7,7 +7,7 @@
 
 import firefox_puppeteer.errors as errors
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 from firefox_puppeteer.ui.windows import BaseWindow
 
 

diff --git a/firefox_ui_harness/__init__.py b/firefox_ui_harness/__init__.py
@@ -4,7 +4,3 @@
 
 from cli_update import cli_update
 from runtests import cli
-
-from testcases import (FirefoxTestCase,
-                       UpdateTestCase,
-                       )
diff --git a/firefox_ui_harness/runners/base.py b/firefox_ui_harness/runners/base.py
@@ -7,8 +7,8 @@
 import mozinfo
 from marionette import BaseMarionetteTestRunner
 
-from firefox_ui_harness.testcases import FirefoxTestCase
 import firefox_ui_tests
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 DEFAULT_PREFS = {

diff --git a/firefox_ui_harness/runners/update.py b/firefox_ui_harness/runners/update.py
@@ -10,7 +10,7 @@
 import mozinstall
 
 from base import FirefoxUITestRunner
-from firefox_ui_harness.testcases import UpdateTestCase
+from firefox_ui_tests.testcases import UpdateTestCase
 
 import firefox_ui_tests
 

diff --git a/firefox_ui_tests/functional/keyboard_shortcuts/test_browser_window.py b/firefox_ui_tests/functional/keyboard_shortcuts/test_browser_window.py
@@ -4,7 +4,7 @@
 
 from marionette_driver import Wait
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestBrowserWindowShortcuts(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/locationbar/test_access_locationbar.py b/firefox_ui_tests/functional/locationbar/test_access_locationbar.py
@@ -5,7 +5,7 @@
 from marionette_driver import Wait
 
 from firefox_ui_harness.decorators import skip_under_xvfb
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestAccessLocationBar(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/locationbar/test_escape_autocomplete.py b/firefox_ui_tests/functional/locationbar/test_escape_autocomplete.py
@@ -5,7 +5,7 @@
 from marionette_driver import Wait
 
 from firefox_ui_harness.decorators import skip_under_xvfb
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestEscapeAutocomplete(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/locationbar/test_favicon_in_autocomplete.py b/firefox_ui_tests/functional/locationbar/test_favicon_in_autocomplete.py
@@ -5,7 +5,7 @@
 from marionette_driver import Wait
 
 from firefox_ui_harness.decorators import skip_under_xvfb
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestFaviconInAutocomplete(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/locationbar/test_suggest_bookmarks.py b/firefox_ui_tests/functional/locationbar/test_suggest_bookmarks.py
@@ -5,7 +5,7 @@
 from marionette_driver import By, Wait
 
 from firefox_ui_harness.decorators import skip_under_xvfb
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestStarInAutocomplete(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/private_browsing/test_about_private_browsing.py b/firefox_ui_tests/functional/private_browsing/test_about_private_browsing.py
@@ -5,7 +5,7 @@
 from marionette_driver import By, Wait
 from marionette.marionette_test import skip_if_e10s
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 from firefox_puppeteer.ui.browser.window import BrowserWindow
 

diff --git a/firefox_ui_tests/functional/security/test_dv_certificate.py b/firefox_ui_tests/functional/security/test_dv_certificate.py
@@ -5,7 +5,7 @@
 from marionette_driver import Wait
 
 from firefox_ui_harness.decorators import skip_under_xvfb
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestDVCertificate(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/security/test_ev_certificate.py b/firefox_ui_tests/functional/security/test_ev_certificate.py
@@ -5,7 +5,7 @@
 from marionette_driver import Wait
 
 from firefox_ui_harness.decorators import skip_under_xvfb
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestEVCertificate(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/security/test_mixed_content_page.py b/firefox_ui_tests/functional/security/test_mixed_content_page.py
@@ -5,7 +5,7 @@
 from marionette_driver import Wait
 
 from firefox_ui_harness.decorators import skip_under_xvfb
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestMixedContentPage(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/security/test_mixed_script_content_blocking.py b/firefox_ui_tests/functional/security/test_mixed_script_content_blocking.py
@@ -5,7 +5,7 @@
 from marionette_driver import By, Wait
 
 from firefox_ui_harness.decorators import skip_under_xvfb
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestMixedScriptContentBlocking(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/security/test_no_certificate.py b/firefox_ui_tests/functional/security/test_no_certificate.py
@@ -7,7 +7,7 @@
 from marionette_driver import expected, Wait
 
 from firefox_ui_harness.decorators import skip_under_xvfb
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestNoCertificate(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/security/test_safe_browsing_notification.py b/firefox_ui_tests/functional/security/test_safe_browsing_notification.py
@@ -6,7 +6,7 @@
 
 from marionette_driver import By, expected, Wait
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestSafeBrowsingNotificationBar(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/security/test_safe_browsing_warning_pages.py b/firefox_ui_tests/functional/security/test_safe_browsing_warning_pages.py
@@ -6,7 +6,7 @@
 
 from marionette_driver import By, expected, Wait
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestSafeBrowsingWarningPages(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/security/test_security_notification.py b/firefox_ui_tests/functional/security/test_security_notification.py
@@ -7,7 +7,7 @@
 from marionette_driver import By, Wait
 from marionette_driver.errors import MarionetteException
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestSecurityNotification(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/security/test_ssl_disabled_error_page.py b/firefox_ui_tests/functional/security/test_ssl_disabled_error_page.py
@@ -7,7 +7,7 @@
 from marionette_driver import By
 from marionette_driver.errors import MarionetteException
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestSSLDisabledErrorPage(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/security/test_ssl_status_after_restart.py b/firefox_ui_tests/functional/security/test_ssl_status_after_restart.py
@@ -6,7 +6,7 @@
 from marionette.marionette_test import skip_if_e10s
 
 from firefox_ui_harness.decorators import skip_under_xvfb
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestSSLStatusAfterRestart(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/security/test_submit_unencrypted_info_warning.py b/firefox_ui_tests/functional/security/test_submit_unencrypted_info_warning.py
@@ -7,7 +7,7 @@
 from marionette_driver.errors import NoAlertPresentException
 from marionette_driver.marionette import Alert
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestSubmitUnencryptedInfoWarning(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/security/test_unknown_issuer.py b/firefox_ui_tests/functional/security/test_unknown_issuer.py
@@ -7,7 +7,7 @@
 from marionette_driver import By
 from marionette_driver.errors import MarionetteException
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestUnknownIssuer(FirefoxTestCase):

diff --git a/firefox_ui_tests/functional/security/test_untrusted_connection_error_page.py b/firefox_ui_tests/functional/security/test_untrusted_connection_error_page.py
@@ -7,7 +7,7 @@
 from marionette_driver import By, Wait
 from marionette_driver.errors import MarionetteException
 
-from firefox_ui_harness import FirefoxTestCase
+from firefox_puppeteer.testcases import FirefoxTestCase
 
 
 class TestUntrustedConnectionErrorPage(FirefoxTestCase):

diff --git a/firefox_ui_harness/testcases/__init__.py → firefox_ui_tests/testcases/__init__.py b/firefox_ui_harness/testcases/__init__.py → firefox_ui_tests/testcases/__init__.py
@@ -2,5 +2,4 @@
 # 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 base import FirefoxTestCase
 from update import UpdateTestCase
diff --git a/firefox_ui_harness/testcases/update.py → firefox_ui_tests/testcases/update.py b/firefox_ui_harness/testcases/update.py → firefox_ui_tests/testcases/update.py
@@ -5,8 +5,8 @@
 import pprint
 
 from firefox_puppeteer.api.software_update import SoftwareUpdate
+from firefox_puppeteer.testcases import FirefoxTestCase
 from firefox_puppeteer.ui.update_wizard import UpdateWizardDialog
-from firefox_ui_harness.testcases import FirefoxTestCase
 
 
 class UpdateTestCase(FirefoxTestCase):

diff --git a/firefox_ui_tests/update/direct/test_direct_update.py b/firefox_ui_tests/update/direct/test_direct_update.py
@@ -2,7 +2,7 @@
 # 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 firefox_ui_harness import UpdateTestCase
+from firefox_ui_tests.testcases import UpdateTestCase
 
 
 class TestDirectUpdate(UpdateTestCase):

diff --git a/firefox_ui_tests/update/fallback/test_fallback_update.py b/firefox_ui_tests/update/fallback/test_fallback_update.py
@@ -2,7 +2,7 @@
 # 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 firefox_ui_harness import UpdateTestCase
+from firefox_ui_tests.testcases import UpdateTestCase
 
 
 class TestFallbackUpdate(UpdateTestCase):