Bug 1239988 - Remove packaging for firefox-ui-tests. r=maja_zf

MozReview-Commit-ID: 1ncPWncD53U

The firefox-ui-tests package is no longer required. Removing it will allow us later to move tests to the appropriate places in the tree. The commit also has updates for the build system and mozharness.

--HG--
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/keyboard_shortcuts/manifest.ini => testing/firefox-ui/tests/functional/keyboard_shortcuts/manifest.ini
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/keyboard_shortcuts/test_browser_window.py => testing/firefox-ui/tests/functional/keyboard_shortcuts/test_browser_window.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/manifest.ini => testing/firefox-ui/tests/functional/locationbar/manifest.ini
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/test_access_locationbar.py => testing/firefox-ui/tests/functional/locationbar/test_access_locationbar.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/test_escape_autocomplete.py => testing/firefox-ui/tests/functional/locationbar/test_escape_autocomplete.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/test_favicon_in_autocomplete.py => testing/firefox-ui/tests/functional/locationbar/test_favicon_in_autocomplete.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/test_suggest_bookmarks.py => testing/firefox-ui/tests/functional/locationbar/test_suggest_bookmarks.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/manifest.ini => testing/firefox-ui/tests/functional/manifest.ini
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/private_browsing/manifest.ini => testing/firefox-ui/tests/functional/private_browsing/manifest.ini
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/private_browsing/test_about_private_browsing.py => testing/firefox-ui/tests/functional/private_browsing/test_about_private_browsing.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/manifest.ini => testing/firefox-ui/tests/functional/security/manifest.ini
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_dv_certificate.py => testing/firefox-ui/tests/functional/security/test_dv_certificate.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_enable_privilege.py => testing/firefox-ui/tests/functional/security/test_enable_privilege.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_ev_certificate.py => testing/firefox-ui/tests/functional/security/test_ev_certificate.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_mixed_content_page.py => testing/firefox-ui/tests/functional/security/test_mixed_content_page.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_mixed_script_content_blocking.py => testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_no_certificate.py => testing/firefox-ui/tests/functional/security/test_no_certificate.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_safe_browsing_notification.py => testing/firefox-ui/tests/functional/security/test_safe_browsing_notification.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_safe_browsing_warning_pages.py => testing/firefox-ui/tests/functional/security/test_safe_browsing_warning_pages.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_security_notification.py => testing/firefox-ui/tests/functional/security/test_security_notification.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_ssl_disabled_error_page.py => testing/firefox-ui/tests/functional/security/test_ssl_disabled_error_page.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_ssl_status_after_restart.py => testing/firefox-ui/tests/functional/security/test_ssl_status_after_restart.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_submit_unencrypted_info_warning.py => testing/firefox-ui/tests/functional/security/test_submit_unencrypted_info_warning.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_unknown_issuer.py => testing/firefox-ui/tests/functional/security/test_unknown_issuer.py
rename : testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_untrusted_connection_error_page.py => testing/firefox-ui/tests/functional/security/test_untrusted_connection_error_page.py
rename : testing/firefox-ui/tests/firefox_ui_tests/manifest.ini => testing/firefox-ui/tests/manifest.ini
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/manifest.ini => testing/firefox-ui/tests/puppeteer/manifest.ini
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_about_window.py => testing/firefox-ui/tests/puppeteer/test_about_window.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_appinfo.py => testing/firefox-ui/tests/puppeteer/test_appinfo.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_l10n.py => testing/firefox-ui/tests/puppeteer/test_l10n.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_menubar.py => testing/firefox-ui/tests/puppeteer/test_menubar.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_page_info_window.py => testing/firefox-ui/tests/puppeteer/test_page_info_window.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_places.py => testing/firefox-ui/tests/puppeteer/test_places.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_prefs.py => testing/firefox-ui/tests/puppeteer/test_prefs.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_security.py => testing/firefox-ui/tests/puppeteer/test_security.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_software_update.py => testing/firefox-ui/tests/puppeteer/test_software_update.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_tabbar.py => testing/firefox-ui/tests/puppeteer/test_tabbar.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_toolbars.py => testing/firefox-ui/tests/puppeteer/test_toolbars.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_update_wizard.py => testing/firefox-ui/tests/puppeteer/test_update_wizard.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_utils.py => testing/firefox-ui/tests/puppeteer/test_utils.py
rename : testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_windows.py => testing/firefox-ui/tests/puppeteer/test_windows.py
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/cookies/cookie_single.html => testing/firefox-ui/tests/resources/cookies/cookie_single.html
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/images/firefox_favicon.ico => testing/firefox-ui/tests/resources/images/firefox_favicon.ico
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/images/mozilla_favicon.ico => testing/firefox-ui/tests/resources/images/mozilla_favicon.ico
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/images/mozilla_logo.jpg => testing/firefox-ui/tests/resources/images/mozilla_logo.jpg
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla.html => testing/firefox-ui/tests/resources/layout/mozilla.html
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_community.html => testing/firefox-ui/tests/resources/layout/mozilla_community.html
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_contribute.html => testing/firefox-ui/tests/resources/layout/mozilla_contribute.html
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_governance.html => testing/firefox-ui/tests/resources/layout/mozilla_governance.html
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_grants.html => testing/firefox-ui/tests/resources/layout/mozilla_grants.html
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_mission.html => testing/firefox-ui/tests/resources/layout/mozilla_mission.html
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_organizations.html => testing/firefox-ui/tests/resources/layout/mozilla_organizations.html
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_projects.html => testing/firefox-ui/tests/resources/layout/mozilla_projects.html
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/private_browsing/about.html => testing/firefox-ui/tests/resources/private_browsing/about.html
rename : testing/firefox-ui/tests/firefox_ui_tests/resources/security/enable_privilege.html => testing/firefox-ui/tests/resources/security/enable_privilege.html
rename : testing/firefox-ui/tests/firefox_ui_tests/update/direct/manifest.ini => testing/firefox-ui/tests/update/direct/manifest.ini
rename : testing/firefox-ui/tests/firefox_ui_tests/update/direct/test_direct_update.py => testing/firefox-ui/tests/update/direct/test_direct_update.py
rename : testing/firefox-ui/tests/firefox_ui_tests/update/fallback/manifest.ini => testing/firefox-ui/tests/update/fallback/manifest.ini
rename : testing/firefox-ui/tests/firefox_ui_tests/update/fallback/test_fallback_update.py => testing/firefox-ui/tests/update/fallback/test_fallback_update.py
rename : testing/firefox-ui/tests/firefox_ui_tests/update/manifest.ini => testing/firefox-ui/tests/update/manifest.ini
extra : rebase_source : 6c79d68264e1350087f3407e623820126d82d7bf

testing/config/firefox_ui_requirements.txt

@@ -1,4 +1,3 @@
 -r marionette_requirements.txt
 ../firefox-ui/harness/
-../firefox-ui/tests/
 ../puppeteer/firefox/

testing/firefox-ui/mach_commands.py

@@ -49,7 +49,7 @@ def run_firefox_ui_test(testtype=None, topsrcdir=None, **kwargs):
         }
     }
 
-    tests_root = os.path.join(topsrcdir, 'testing', 'firefox-ui', 'tests', 'firefox_ui_tests')
+    tests_root = os.path.join(topsrcdir, 'testing', 'firefox-ui', 'tests')
 
     # Set the resources path which is used to serve test data via wptserve
     if not kwargs['server_root']:

testing/firefox-ui/tests/MANIFEST.in

@@ -1,2 +0,0 @@
-exclude MANIFEST.in
-recursive-include firefox_ui_tests *

testing/firefox-ui/tests/firefox_ui_tests/__init__.py

@@ -1,16 +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/.
-
-import os
-
-root = os.path.abspath(os.path.dirname(__file__))
-
-manifest_all = os.path.join(root, 'manifest.ini')
-
-manifest_functional = os.path.join(root, 'functional', 'manifest.ini')
-
-manifest_update_direct = os.path.join(root, 'update', 'direct', 'manifest.ini')
-manifest_update_fallback = os.path.join(root, 'update', 'fallback', 'manifest.ini')
-
-resources = os.path.join(root, 'resources')

testing/firefox-ui/tests/setup.py

@@ -1,44 +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 setuptools import setup, find_packages
-
-PACKAGE_VERSION = '0.3.1'
-
-deps = [
-    'firefox-puppeteer >= 3.2.0, <4.0.0',
-    'firefox-ui-harness == 1.2.0',
-]
-
-setup(name='firefox-ui-tests',
-      version=PACKAGE_VERSION,
-      description='A collection of Mozilla Firefox UI tests run with Marionette',
-      long_description='See https://github.com/mozilla/firefox-ui-tests',
-      classifiers=['Environment :: Console',
-                   'Intended Audience :: Developers',
-                   'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
-                   'Natural Language :: English',
-                   'Operating System :: OS Independent',
-                   'Programming Language :: Python',
-                   'Topic :: Software Development :: Libraries :: Python Modules',
-                   ],
-      keywords='mozilla',
-      author='Mozilla Automation and Tools Team',
-      author_email='tools@lists.mozilla.org',
-      url='https://github.com/mozilla/firefox-ui-tests',
-      license='MPL 2.0',
-      packages=find_packages(),
-      include_package_data=True,
-      package_data={
-          '': [
-              '*.html',
-              '*.ico',
-              '*.ini',
-              '*.jpg',
-              '*.js',
-          ]
-      },
-      zip_safe=False,
-      install_requires=deps,
-      )

testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py

@@ -208,12 +208,12 @@ class FirefoxUITests(TestingMixin, VCSToolsScript):
             return self.abs_dirs
 
         abs_dirs = super(FirefoxUITests, self).query_abs_dirs()
-        tests_dir = os.path.join(abs_dirs['abs_work_dir'], 'tests')
+        abs_tests_install_dir = os.path.join(abs_dirs['abs_work_dir'], 'tests')
 
         dirs = {
             'abs_reports_dir': os.path.join(abs_dirs['base_work_dir'], 'reports'),
-            'abs_test_install_dir': tests_dir,
-            'fxui_tests_dir': os.path.join(tests_dir, 'firefox-ui', 'tests', 'firefox_ui_tests'),
+            'abs_test_install_dir': abs_tests_install_dir,
+            'abs_fxui_tests_dir': os.path.join(abs_tests_install_dir, 'firefox-ui', 'tests'),
         }
 
         for key in dirs:
@@ -303,7 +303,7 @@ class FirefoxUITests(TestingMixin, VCSToolsScript):
             '--address', 'localhost:{}'.format(marionette_port),
 
             # Resource files to serve via local webserver
-            '--server-root', os.path.join(dirs['fxui_tests_dir'], 'resources'),
+            '--server-root', os.path.join(dirs['abs_fxui_tests_dir'], 'resources'),
 
             # Use the work dir to get temporary data stored
             '--workspace', dirs['abs_work_dir'],
@@ -334,7 +334,7 @@ class FirefoxUITests(TestingMixin, VCSToolsScript):
                                         strict=False)
 
         # Add the top-level tests manifest file
-        cmd.append(os.path.join(dirs['fxui_tests_dir'], self.tests_manifest))
+        cmd.append(os.path.join(dirs['abs_fxui_tests_dir'], self.tests_manifest))
 
         return_code = self.run_command(cmd,
                                        cwd=dirs['abs_work_dir'],