Bug 1319705 - Move Puppeteer to testing/marionette and make it available for Marionette tests in test packages. r=gps
authorHenrik Skupin <mail@hskupin.info>
Thu, 24 Nov 2016 17:02:52 +0100
changeset 324793 7eab0a7c766e258f2849edf6b8666727354a2968
parent 324792 12db8198fa96e1620648583ca1d06a7ef97fb18d
child 324794 c021b68fc7dfbc9890e225db9d98e4763d7f08b6
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersgps
bugs1319705
milestone53.0a1
Bug 1319705 - Move Puppeteer to testing/marionette and make it available for Marionette tests in test packages. r=gps MozReview-Commit-ID: 521o0fV72SQ
build/mach_bootstrap.py
python/mozbuild/mozbuild/action/test_archive.py
testing/config/external-media-tests-requirements.txt
testing/config/firefox_ui_requirements.txt
testing/config/marionette_requirements.txt
testing/firefox-ui/moz.build
testing/marionette/puppeteer/.flake8
testing/marionette/puppeteer/firefox/MANIFEST.in
testing/marionette/puppeteer/firefox/docs/Makefile
testing/marionette/puppeteer/firefox/docs/api/appinfo.rst
testing/marionette/puppeteer/firefox/docs/api/keys.rst
testing/marionette/puppeteer/firefox/docs/api/l10n.rst
testing/marionette/puppeteer/firefox/docs/api/places.rst
testing/marionette/puppeteer/firefox/docs/api/prefs.rst
testing/marionette/puppeteer/firefox/docs/api/security.rst
testing/marionette/puppeteer/firefox/docs/api/software_update.rst
testing/marionette/puppeteer/firefox/docs/api/utils.rst
testing/marionette/puppeteer/firefox/docs/conf.py
testing/marionette/puppeteer/firefox/docs/index.rst
testing/marionette/puppeteer/firefox/docs/make.bat
testing/marionette/puppeteer/firefox/docs/ui/about_window/window.rst
testing/marionette/puppeteer/firefox/docs/ui/browser/notifications.rst
testing/marionette/puppeteer/firefox/docs/ui/browser/tabbar.rst
testing/marionette/puppeteer/firefox/docs/ui/browser/toolbars.rst
testing/marionette/puppeteer/firefox/docs/ui/browser/window.rst
testing/marionette/puppeteer/firefox/docs/ui/deck.rst
testing/marionette/puppeteer/firefox/docs/ui/menu.rst
testing/marionette/puppeteer/firefox/docs/ui/pageinfo/window.rst
testing/marionette/puppeteer/firefox/docs/ui/update_wizard/dialog.rst
testing/marionette/puppeteer/firefox/docs/ui/windows.rst
testing/marionette/puppeteer/firefox/firefox_puppeteer/__init__.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/api/__init__.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/api/appinfo.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/api/keys.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/api/l10n.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/api/places.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/api/prefs.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/api/security.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/api/software_update.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/api/utils.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/base.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/decorators.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/errors.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/mixins.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/puppeteer.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/__init__.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/about_window/__init__.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/about_window/deck.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/about_window/window.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/base.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/__init__.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/notifications.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/tabbar.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/toolbars.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/deck.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/menu.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/__init__.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/deck.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/window.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/__init__.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/dialog.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/wizard.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/windows.py
testing/marionette/puppeteer/firefox/requirements-docs.txt
testing/marionette/puppeteer/firefox/requirements.txt
testing/marionette/puppeteer/firefox/setup.py
testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
testing/mozharness/scripts/marionette.py
testing/puppeteer/.flake8
testing/puppeteer/firefox/MANIFEST.in
testing/puppeteer/firefox/docs/Makefile
testing/puppeteer/firefox/docs/api/appinfo.rst
testing/puppeteer/firefox/docs/api/keys.rst
testing/puppeteer/firefox/docs/api/l10n.rst
testing/puppeteer/firefox/docs/api/places.rst
testing/puppeteer/firefox/docs/api/prefs.rst
testing/puppeteer/firefox/docs/api/security.rst
testing/puppeteer/firefox/docs/api/software_update.rst
testing/puppeteer/firefox/docs/api/utils.rst
testing/puppeteer/firefox/docs/conf.py
testing/puppeteer/firefox/docs/index.rst
testing/puppeteer/firefox/docs/make.bat
testing/puppeteer/firefox/docs/ui/about_window/window.rst
testing/puppeteer/firefox/docs/ui/browser/notifications.rst
testing/puppeteer/firefox/docs/ui/browser/tabbar.rst
testing/puppeteer/firefox/docs/ui/browser/toolbars.rst
testing/puppeteer/firefox/docs/ui/browser/window.rst
testing/puppeteer/firefox/docs/ui/deck.rst
testing/puppeteer/firefox/docs/ui/menu.rst
testing/puppeteer/firefox/docs/ui/pageinfo/window.rst
testing/puppeteer/firefox/docs/ui/update_wizard/dialog.rst
testing/puppeteer/firefox/docs/ui/windows.rst
testing/puppeteer/firefox/firefox_puppeteer/__init__.py
testing/puppeteer/firefox/firefox_puppeteer/api/__init__.py
testing/puppeteer/firefox/firefox_puppeteer/api/appinfo.py
testing/puppeteer/firefox/firefox_puppeteer/api/keys.py
testing/puppeteer/firefox/firefox_puppeteer/api/l10n.py
testing/puppeteer/firefox/firefox_puppeteer/api/places.py
testing/puppeteer/firefox/firefox_puppeteer/api/prefs.py
testing/puppeteer/firefox/firefox_puppeteer/api/security.py
testing/puppeteer/firefox/firefox_puppeteer/api/software_update.py
testing/puppeteer/firefox/firefox_puppeteer/api/utils.py
testing/puppeteer/firefox/firefox_puppeteer/base.py
testing/puppeteer/firefox/firefox_puppeteer/decorators.py
testing/puppeteer/firefox/firefox_puppeteer/errors.py
testing/puppeteer/firefox/firefox_puppeteer/mixins.py
testing/puppeteer/firefox/firefox_puppeteer/puppeteer.py
testing/puppeteer/firefox/firefox_puppeteer/ui/__init__.py
testing/puppeteer/firefox/firefox_puppeteer/ui/about_window/__init__.py
testing/puppeteer/firefox/firefox_puppeteer/ui/about_window/deck.py
testing/puppeteer/firefox/firefox_puppeteer/ui/about_window/window.py
testing/puppeteer/firefox/firefox_puppeteer/ui/base.py
testing/puppeteer/firefox/firefox_puppeteer/ui/browser/__init__.py
testing/puppeteer/firefox/firefox_puppeteer/ui/browser/notifications.py
testing/puppeteer/firefox/firefox_puppeteer/ui/browser/tabbar.py
testing/puppeteer/firefox/firefox_puppeteer/ui/browser/toolbars.py
testing/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py
testing/puppeteer/firefox/firefox_puppeteer/ui/deck.py
testing/puppeteer/firefox/firefox_puppeteer/ui/menu.py
testing/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/__init__.py
testing/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/deck.py
testing/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/window.py
testing/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/__init__.py
testing/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/dialog.py
testing/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/wizard.py
testing/puppeteer/firefox/firefox_puppeteer/ui/windows.py
testing/puppeteer/firefox/requirements-docs.txt
testing/puppeteer/firefox/requirements.txt
testing/puppeteer/firefox/setup.py
tools/lint/flake8.lint
--- a/build/mach_bootstrap.py
+++ b/build/mach_bootstrap.py
@@ -61,20 +61,20 @@ SEARCH_PATHS = [
     'dom/bindings',
     'dom/bindings/parser',
     'dom/media/test/external',
     'layout/tools/reftest',
     'other-licenses/ply',
     'taskcluster',
     'testing',
     'testing/firefox-ui/harness',
-    'testing/firefox-ui/tests',
+    'testing/marionette/client',
     'testing/marionette/harness',
     'testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py',
-    'testing/marionette/client',
+    'testing/marionette/puppeteer/firefox',
     'testing/mozbase/mozcrash',
     'testing/mozbase/mozdebug',
     'testing/mozbase/mozdevice',
     'testing/mozbase/mozfile',
     'testing/mozbase/mozhttpd',
     'testing/mozbase/mozinfo',
     'testing/mozbase/mozinstall',
     'testing/mozbase/mozleak',
@@ -83,17 +83,16 @@ SEARCH_PATHS = [
     'testing/mozbase/mozprocess',
     'testing/mozbase/mozprofile',
     'testing/mozbase/mozrunner',
     'testing/mozbase/mozsystemmonitor',
     'testing/mozbase/mozscreenshot',
     'testing/mozbase/moztest',
     'testing/mozbase/mozversion',
     'testing/mozbase/manifestparser',
-    'testing/puppeteer/firefox',
     'testing/taskcluster',
     'testing/tools/autotry',
     'testing/web-platform',
     'testing/web-platform/harness',
     'testing/web-platform/tests/tools/wptserve',
     'testing/xpcshell',
     'xpcom/idl-parser',
 ]
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -94,28 +94,26 @@ ARCHIVE_FILES = {
             'base': '_tests',
             'pattern': 'modules/**',
         },
         {
             'source': buildconfig.topsrcdir,
             'base': 'testing/marionette',
             'patterns': [
                 'client/**',
+                'harness/**',
+                'puppeteer/**',
                 'mach_test_package_commands.py',
             ],
             'dest': 'marionette',
-        },
-        {
-            'source': buildconfig.topsrcdir,
-            'base': 'testing/marionette/harness',
-            'pattern': '**',
-            'dest': 'marionette',
             'ignore': [
-                'marionette/tests'
-            ]
+                'harness/docs',
+                'harness/marionette/tests',
+                'puppeteer/firefox/docs',
+            ],
         },
         {
             'source': buildconfig.topsrcdir,
             'base': '',
             'manifests': [
                 'testing/marionette/harness/marionette/tests/unit-tests.ini',
                 'testing/marionette/harness/marionette/tests/webapi-tests.ini',
             ],
@@ -167,21 +165,16 @@ ARCHIVE_FILES = {
             'source': buildconfig.topsrcdir,
             'base': 'js/src',
             'pattern': 'jsapi.h',
             'dest': 'jit-test',
         },
         {
             'source': buildconfig.topsrcdir,
             'base': 'testing',
-            'pattern': 'puppeteer/**',
-        },
-        {
-            'source': buildconfig.topsrcdir,
-            'base': 'testing',
             'pattern': 'tps/**',
         },
         {
             'source': buildconfig.topsrcdir,
             'base': 'services/sync/',
             'pattern': 'tps/**',
         },
         {
--- a/testing/config/external-media-tests-requirements.txt
+++ b/testing/config/external-media-tests-requirements.txt
@@ -1,3 +1,2 @@
 -r marionette_requirements.txt
-../puppeteer/firefox/
 ../external-media-tests/
--- a/testing/config/firefox_ui_requirements.txt
+++ b/testing/config/firefox_ui_requirements.txt
@@ -1,3 +1,2 @@
 -r marionette_requirements.txt
 ../firefox-ui/harness/
-../puppeteer/firefox/
--- a/testing/config/marionette_requirements.txt
+++ b/testing/config/marionette_requirements.txt
@@ -1,5 +1,8 @@
 -r mozbase_requirements.txt
 ../tools/wptserve
 ../marionette/client
-../marionette/marionette/runner/mixins/browsermob-proxy-py
-../marionette
+../marionette/harness/marionette/runner/mixins/browsermob-proxy-py
+../marionette/harness
+
+# Allows to use the Puppeteer page object model for Firefox
+../marionette/puppeteer/firefox/
--- a/testing/firefox-ui/moz.build
+++ b/testing/firefox-ui/moz.build
@@ -1,11 +1,11 @@
 # 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/.
 
 FIREFOX_UI_FUNCTIONAL_MANIFESTS += ["tests/functional/manifest.ini"]
 FIREFOX_UI_UPDATE_MANIFESTS += ["tests/update/manifest.ini"]
-# Bug 1272145: Move to testing/puppeteer/firefox
+# TODO: Move to testing/marionette/puppeteer/firefox
 PUPPETEER_FIREFOX_MANIFESTS += ["tests/puppeteer/manifest.ini"]
 
 with Files("**"):
     BUG_COMPONENT = ("Testing", "Firefox UI Tests")
rename from testing/puppeteer/.flake8
rename to testing/marionette/puppeteer/.flake8
rename from testing/puppeteer/firefox/MANIFEST.in
rename to testing/marionette/puppeteer/firefox/MANIFEST.in
rename from testing/puppeteer/firefox/docs/Makefile
rename to testing/marionette/puppeteer/firefox/docs/Makefile
rename from testing/puppeteer/firefox/docs/api/appinfo.rst
rename to testing/marionette/puppeteer/firefox/docs/api/appinfo.rst
rename from testing/puppeteer/firefox/docs/api/keys.rst
rename to testing/marionette/puppeteer/firefox/docs/api/keys.rst
rename from testing/puppeteer/firefox/docs/api/l10n.rst
rename to testing/marionette/puppeteer/firefox/docs/api/l10n.rst
rename from testing/puppeteer/firefox/docs/api/places.rst
rename to testing/marionette/puppeteer/firefox/docs/api/places.rst
rename from testing/puppeteer/firefox/docs/api/prefs.rst
rename to testing/marionette/puppeteer/firefox/docs/api/prefs.rst
rename from testing/puppeteer/firefox/docs/api/security.rst
rename to testing/marionette/puppeteer/firefox/docs/api/security.rst
rename from testing/puppeteer/firefox/docs/api/software_update.rst
rename to testing/marionette/puppeteer/firefox/docs/api/software_update.rst
rename from testing/puppeteer/firefox/docs/api/utils.rst
rename to testing/marionette/puppeteer/firefox/docs/api/utils.rst
rename from testing/puppeteer/firefox/docs/conf.py
rename to testing/marionette/puppeteer/firefox/docs/conf.py
rename from testing/puppeteer/firefox/docs/index.rst
rename to testing/marionette/puppeteer/firefox/docs/index.rst
rename from testing/puppeteer/firefox/docs/make.bat
rename to testing/marionette/puppeteer/firefox/docs/make.bat
rename from testing/puppeteer/firefox/docs/ui/about_window/window.rst
rename to testing/marionette/puppeteer/firefox/docs/ui/about_window/window.rst
rename from testing/puppeteer/firefox/docs/ui/browser/notifications.rst
rename to testing/marionette/puppeteer/firefox/docs/ui/browser/notifications.rst
rename from testing/puppeteer/firefox/docs/ui/browser/tabbar.rst
rename to testing/marionette/puppeteer/firefox/docs/ui/browser/tabbar.rst
rename from testing/puppeteer/firefox/docs/ui/browser/toolbars.rst
rename to testing/marionette/puppeteer/firefox/docs/ui/browser/toolbars.rst
rename from testing/puppeteer/firefox/docs/ui/browser/window.rst
rename to testing/marionette/puppeteer/firefox/docs/ui/browser/window.rst
rename from testing/puppeteer/firefox/docs/ui/deck.rst
rename to testing/marionette/puppeteer/firefox/docs/ui/deck.rst
rename from testing/puppeteer/firefox/docs/ui/menu.rst
rename to testing/marionette/puppeteer/firefox/docs/ui/menu.rst
rename from testing/puppeteer/firefox/docs/ui/pageinfo/window.rst
rename to testing/marionette/puppeteer/firefox/docs/ui/pageinfo/window.rst
rename from testing/puppeteer/firefox/docs/ui/update_wizard/dialog.rst
rename to testing/marionette/puppeteer/firefox/docs/ui/update_wizard/dialog.rst
rename from testing/puppeteer/firefox/docs/ui/windows.rst
rename to testing/marionette/puppeteer/firefox/docs/ui/windows.rst
rename from testing/puppeteer/firefox/firefox_puppeteer/__init__.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/__init__.py
rename from testing/puppeteer/firefox/firefox_puppeteer/api/__init__.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/api/__init__.py
rename from testing/puppeteer/firefox/firefox_puppeteer/api/appinfo.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/api/appinfo.py
rename from testing/puppeteer/firefox/firefox_puppeteer/api/keys.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/api/keys.py
rename from testing/puppeteer/firefox/firefox_puppeteer/api/l10n.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/api/l10n.py
rename from testing/puppeteer/firefox/firefox_puppeteer/api/places.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/api/places.py
rename from testing/puppeteer/firefox/firefox_puppeteer/api/prefs.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/api/prefs.py
rename from testing/puppeteer/firefox/firefox_puppeteer/api/security.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/api/security.py
rename from testing/puppeteer/firefox/firefox_puppeteer/api/software_update.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/api/software_update.py
rename from testing/puppeteer/firefox/firefox_puppeteer/api/utils.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/api/utils.py
rename from testing/puppeteer/firefox/firefox_puppeteer/base.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/base.py
rename from testing/puppeteer/firefox/firefox_puppeteer/decorators.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/decorators.py
rename from testing/puppeteer/firefox/firefox_puppeteer/errors.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/errors.py
rename from testing/puppeteer/firefox/firefox_puppeteer/mixins.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/mixins.py
rename from testing/puppeteer/firefox/firefox_puppeteer/puppeteer.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/puppeteer.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/__init__.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/__init__.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/about_window/__init__.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/about_window/__init__.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/about_window/deck.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/about_window/deck.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/about_window/window.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/about_window/window.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/base.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/base.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/browser/__init__.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/__init__.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/browser/notifications.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/notifications.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/browser/tabbar.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/tabbar.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/browser/toolbars.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/toolbars.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/deck.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/deck.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/menu.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/menu.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/__init__.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/__init__.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/deck.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/deck.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/window.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/window.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/__init__.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/__init__.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/dialog.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/dialog.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/wizard.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/wizard.py
rename from testing/puppeteer/firefox/firefox_puppeteer/ui/windows.py
rename to testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/windows.py
rename from testing/puppeteer/firefox/requirements-docs.txt
rename to testing/marionette/puppeteer/firefox/requirements-docs.txt
--- a/testing/puppeteer/firefox/requirements-docs.txt
+++ b/testing/marionette/puppeteer/firefox/requirements-docs.txt
@@ -1,6 +1,5 @@
 sphinx
 sphinx_rtd_theme
 
 # Required by Readthedocs to install the firefox-puppeteer package
--e testing/puppeteer/firefox
-
+-e testing/marionette/puppeteer/firefox
rename from testing/puppeteer/firefox/requirements.txt
rename to testing/marionette/puppeteer/firefox/requirements.txt
rename from testing/puppeteer/firefox/setup.py
rename to testing/marionette/puppeteer/firefox/setup.py
--- a/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
+++ b/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
@@ -129,27 +129,21 @@ class FirefoxUITests(TestingMixin, VCSTo
     def _pre_create_virtualenv(self, action):
         dirs = self.query_abs_dirs()
 
         requirements = os.path.join(dirs['abs_test_install_dir'],
                                     'config', 'firefox_ui_requirements.txt')
         self.register_virtualenv_module(requirements=[requirements], two_pass=True)
 
     def download_and_extract(self):
-        """Overriding method from TestingMixin for more specific behavior.
-
-        We use the test_packages_url command line argument to check where to get the
-        harness, puppeteer, and tests from and how to set them up.
-
-        """
+        """Override method from TestingMixin for more specific behavior."""
         extract_dirs = ['config/*',
                         'firefox-ui/*',
                         'marionette/*',
                         'mozbase/*',
-                        'puppeteer/*',
                         'tools/wptserve/*',
                         ]
         super(FirefoxUITests, self).download_and_extract(extract_dirs=extract_dirs)
 
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs
 
--- a/testing/mozharness/scripts/marionette.py
+++ b/testing/mozharness/scripts/marionette.py
@@ -147,17 +147,17 @@ class MarionetteTest(TestingMixin, Mercu
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs
         abs_dirs = super(MarionetteTest, self).query_abs_dirs()
         dirs = {}
         dirs['abs_test_install_dir'] = os.path.join(
             abs_dirs['abs_work_dir'], 'tests')
         dirs['abs_marionette_dir'] = os.path.join(
-            dirs['abs_test_install_dir'], 'marionette', 'marionette')
+            dirs['abs_test_install_dir'], 'marionette', 'harness', 'marionette')
         dirs['abs_marionette_tests_dir'] = os.path.join(
             dirs['abs_test_install_dir'], 'marionette', 'tests', 'testing',
             'marionette', 'harness', 'marionette', 'tests')
         dirs['abs_gecko_dir'] = os.path.join(
             abs_dirs['abs_work_dir'], 'gecko')
         dirs['abs_emulator_dir'] = os.path.join(
             abs_dirs['abs_work_dir'], 'emulator')
 
--- a/tools/lint/flake8.lint
+++ b/tools/lint/flake8.lint
@@ -176,19 +176,19 @@ LINTER = {
     'name': "flake8",
     'description': "Python linter",
     'include': [
         'python/mozlint',
         'taskcluster',
         'testing/firefox-ui',
         'testing/marionette/client',
         'testing/marionette/harness',
+        'testing/marionette/puppeteer',
         'testing/mozbase',
         'testing/mochitest',
-        'testing/puppeteer',
         'testing/talos/',
         'tools/lint',
     ],
     'exclude': ["testing/mozbase/mozdevice/mozdevice/Zeroconf.py",
                 'testing/mochitest/pywebsocket'],
     'extensions': EXTENSIONS,
     'type': 'external',
     'payload': lint,