gecko-dev/build/mach_bootstrap.py

414 строки
14 KiB
Python
Исходник Обычный вид История

# 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 __future__ import print_function, unicode_literals
Bug 1182677 - Aggressively prompt to run `mach mercurial-setup`; r=smacleod Having not configured or out-of-date tools benefits nobody. It slows people down. Version control tools are an integral part of working on Firefox. It is important for version control tools to be configured optimally and to be continuously updated so they stay optimal. The `mach mercurial-setup` command exists to optimally configure Mercurial for working on Firefox and other Mozilla projects. This commit adds a pre-dispatch handler to mach that will verify Mercurial is in a happy state. If `mach mercurial-setup` has never executed, it will complain. If `mach mercurial-setup` hasn't been executed in the past 31 days, it will complain. Yes, aborting command execution and forcing people to context switch to run `mach mercurial-setup` is annoying. First, we have carved out several exceptions to this behavior, including detection for running in automation, on the machines of curmudgeons, when Mercurial isn't being used, and from non-interactive processes. Second, I argue that people ignore optional notifications and that having persistently poorly-configured tools is worse than a single context switch at most every month. Therefore, the heavyhanded approach is justified. In addition, if we did support a non-fatal notification, we would introduce the problem of extra output from commands. If anyone was e.g. parsing mach output, we could very likely break those systems. These cases should be caught by the isatty() check or be running in a context with MOZ_AUTOMATION set. But you never know. --HG-- extra : commitid : 7f7JQpa953u extra : rebase_source : 47b6304b6ac2c9d8136f2023a7d03df7d1f45e4f extra : source : f06616ee7b2b54d63d20ee4795539514d1df8c7b
2015-07-15 00:20:03 +03:00
import errno
import json
import os
import platform
import random
import subprocess
import sys
import uuid
import __builtin__
from types import ModuleType
STATE_DIR_FIRST_RUN = '''
mach and the build system store shared state in a common directory on the
filesystem. The following directory will be created:
{userdir}
If you would like to use a different directory, hit CTRL+c and set the
MOZBUILD_STATE_PATH environment variable to the directory you would like to
use and re-run mach. For this change to take effect forever, you'll likely
want to export this environment variable from your shell's init scripts.
Press ENTER/RETURN to continue or CTRL+c to abort.
'''.lstrip()
# TODO Bug 794506 Integrate with the in-tree virtualenv configuration.
SEARCH_PATHS = [
'python/mach',
'python/mozboot',
'python/mozbuild',
'python/mozlint',
'python/mozversioncontrol',
'python/blessings',
'python/compare-locales',
'python/configobj',
'python/futures',
'python/jsmin',
'python/psutil',
'python/pylru',
'python/which',
'python/pystache',
'python/pyyaml/lib',
'python/requests',
'python/slugid',
'python/py',
'python/pytest',
'python/redo',
'python/voluptuous',
'build',
'build/pymake',
'config',
'dom/bindings',
'dom/bindings/parser',
'dom/media/test/external',
'layout/tools/reftest',
'other-licenses/ply',
'taskcluster',
'testing',
'testing/firefox-ui/harness',
Bug 1319705 - Move Puppeteer to testing/marionette and make it available for Marionette tests in test packages. r=gps MozReview-Commit-ID: 521o0fV72SQ --HG-- rename : testing/puppeteer/.flake8 => testing/marionette/puppeteer/.flake8 rename : testing/puppeteer/firefox/MANIFEST.in => testing/marionette/puppeteer/firefox/MANIFEST.in rename : testing/puppeteer/firefox/docs/Makefile => testing/marionette/puppeteer/firefox/docs/Makefile rename : testing/puppeteer/firefox/docs/api/appinfo.rst => testing/marionette/puppeteer/firefox/docs/api/appinfo.rst rename : testing/puppeteer/firefox/docs/api/keys.rst => testing/marionette/puppeteer/firefox/docs/api/keys.rst rename : testing/puppeteer/firefox/docs/api/l10n.rst => testing/marionette/puppeteer/firefox/docs/api/l10n.rst rename : testing/puppeteer/firefox/docs/api/places.rst => testing/marionette/puppeteer/firefox/docs/api/places.rst rename : testing/puppeteer/firefox/docs/api/prefs.rst => testing/marionette/puppeteer/firefox/docs/api/prefs.rst rename : testing/puppeteer/firefox/docs/api/security.rst => testing/marionette/puppeteer/firefox/docs/api/security.rst rename : testing/puppeteer/firefox/docs/api/software_update.rst => testing/marionette/puppeteer/firefox/docs/api/software_update.rst rename : testing/puppeteer/firefox/docs/api/utils.rst => testing/marionette/puppeteer/firefox/docs/api/utils.rst rename : testing/puppeteer/firefox/docs/conf.py => testing/marionette/puppeteer/firefox/docs/conf.py rename : testing/puppeteer/firefox/docs/index.rst => testing/marionette/puppeteer/firefox/docs/index.rst rename : testing/puppeteer/firefox/docs/make.bat => testing/marionette/puppeteer/firefox/docs/make.bat rename : testing/puppeteer/firefox/docs/ui/about_window/window.rst => testing/marionette/puppeteer/firefox/docs/ui/about_window/window.rst rename : testing/puppeteer/firefox/docs/ui/browser/notifications.rst => testing/marionette/puppeteer/firefox/docs/ui/browser/notifications.rst rename : testing/puppeteer/firefox/docs/ui/browser/tabbar.rst => testing/marionette/puppeteer/firefox/docs/ui/browser/tabbar.rst rename : testing/puppeteer/firefox/docs/ui/browser/toolbars.rst => testing/marionette/puppeteer/firefox/docs/ui/browser/toolbars.rst rename : testing/puppeteer/firefox/docs/ui/browser/window.rst => testing/marionette/puppeteer/firefox/docs/ui/browser/window.rst rename : testing/puppeteer/firefox/docs/ui/deck.rst => testing/marionette/puppeteer/firefox/docs/ui/deck.rst rename : testing/puppeteer/firefox/docs/ui/menu.rst => testing/marionette/puppeteer/firefox/docs/ui/menu.rst rename : testing/puppeteer/firefox/docs/ui/pageinfo/window.rst => testing/marionette/puppeteer/firefox/docs/ui/pageinfo/window.rst rename : testing/puppeteer/firefox/docs/ui/update_wizard/dialog.rst => testing/marionette/puppeteer/firefox/docs/ui/update_wizard/dialog.rst rename : testing/puppeteer/firefox/docs/ui/windows.rst => testing/marionette/puppeteer/firefox/docs/ui/windows.rst rename : testing/puppeteer/firefox/firefox_puppeteer/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/appinfo.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/appinfo.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/keys.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/keys.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/l10n.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/l10n.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/places.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/places.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/prefs.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/prefs.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/security.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/security.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/software_update.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/software_update.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/utils.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/utils.py rename : testing/puppeteer/firefox/firefox_puppeteer/base.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/base.py rename : testing/puppeteer/firefox/firefox_puppeteer/decorators.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/decorators.py rename : testing/puppeteer/firefox/firefox_puppeteer/errors.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/errors.py rename : testing/puppeteer/firefox/firefox_puppeteer/mixins.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/mixins.py rename : testing/puppeteer/firefox/firefox_puppeteer/puppeteer.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/puppeteer.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/about_window/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/about_window/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/about_window/deck.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/about_window/deck.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/about_window/window.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/about_window/window.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/base.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/base.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/browser/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/browser/notifications.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/notifications.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/browser/tabbar.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/tabbar.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/browser/toolbars.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/toolbars.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/deck.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/deck.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/menu.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/menu.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/deck.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/deck.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/window.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/window.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/dialog.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/dialog.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/wizard.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/wizard.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/windows.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/windows.py rename : testing/puppeteer/firefox/requirements-docs.txt => testing/marionette/puppeteer/firefox/requirements-docs.txt rename : testing/puppeteer/firefox/requirements.txt => testing/marionette/puppeteer/firefox/requirements.txt rename : testing/puppeteer/firefox/setup.py => testing/marionette/puppeteer/firefox/setup.py extra : rebase_source : 2c34436c2669cab33d7d3b3f2b23c46c7d3a27d7
2016-11-24 19:02:52 +03:00
'testing/marionette/client',
Bug 1246407 - Rename parent directories for Marionette client and test harness; r=automatedtester This change moves testing/marionette/client to testing/marionette/harness, and testing/marionette/driver to testing/marionette/client. This parent directory name change reflects the true purpose of these Python packages. MozReview-Commit-ID: B0KrGzDTLlQ --HG-- rename : testing/marionette/driver/marionette_driver/__init__.py => testing/marionette/client/marionette_driver/__init__.py rename : testing/marionette/driver/marionette_driver/addons.py => testing/marionette/client/marionette_driver/addons.py rename : testing/marionette/driver/marionette_driver/by.py => testing/marionette/client/marionette_driver/by.py rename : testing/marionette/driver/marionette_driver/date_time_value.py => testing/marionette/client/marionette_driver/date_time_value.py rename : testing/marionette/driver/marionette_driver/decorators.py => testing/marionette/client/marionette_driver/decorators.py rename : testing/marionette/driver/marionette_driver/errors.py => testing/marionette/client/marionette_driver/errors.py rename : testing/marionette/driver/marionette_driver/expected.py => testing/marionette/client/marionette_driver/expected.py rename : testing/marionette/driver/marionette_driver/geckoinstance.py => testing/marionette/client/marionette_driver/geckoinstance.py rename : testing/marionette/driver/marionette_driver/gestures.py => testing/marionette/client/marionette_driver/gestures.py rename : testing/marionette/driver/marionette_driver/keys.py => testing/marionette/client/marionette_driver/keys.py rename : testing/marionette/driver/marionette_driver/marionette.py => testing/marionette/client/marionette_driver/marionette.py rename : testing/marionette/driver/marionette_driver/selection.py => testing/marionette/client/marionette_driver/selection.py rename : testing/marionette/driver/marionette_driver/transport.py => testing/marionette/client/marionette_driver/transport.py rename : testing/marionette/driver/marionette_driver/wait.py => testing/marionette/client/marionette_driver/wait.py rename : testing/marionette/client/MANIFEST.in => testing/marionette/harness/MANIFEST.in rename : testing/marionette/client/docs/Makefile => testing/marionette/harness/docs/Makefile rename : testing/marionette/client/docs/advanced/actions.rst => testing/marionette/harness/docs/advanced/actions.rst rename : testing/marionette/client/docs/advanced/debug.rst => testing/marionette/harness/docs/advanced/debug.rst rename : testing/marionette/client/docs/advanced/findelement.rst => testing/marionette/harness/docs/advanced/findelement.rst rename : testing/marionette/client/docs/advanced/landing.rst => testing/marionette/harness/docs/advanced/landing.rst rename : testing/marionette/client/docs/advanced/stale.rst => testing/marionette/harness/docs/advanced/stale.rst rename : testing/marionette/client/docs/basics.rst => testing/marionette/harness/docs/basics.rst rename : testing/marionette/client/docs/conf.py => testing/marionette/harness/docs/conf.py rename : testing/marionette/client/docs/index.rst => testing/marionette/harness/docs/index.rst rename : testing/marionette/client/docs/interactive.rst => testing/marionette/harness/docs/interactive.rst rename : testing/marionette/client/docs/make.bat => testing/marionette/harness/docs/make.bat rename : testing/marionette/client/docs/reference.rst => testing/marionette/harness/docs/reference.rst rename : testing/marionette/client/marionette/__init__.py => testing/marionette/harness/marionette/__init__.py rename : testing/marionette/client/marionette/atoms/b2g_update_test.js => testing/marionette/harness/marionette/atoms/b2g_update_test.js rename : testing/marionette/client/marionette/b2g_update_test.py => testing/marionette/harness/marionette/b2g_update_test.py rename : testing/marionette/client/marionette/chrome/test.xul => testing/marionette/harness/marionette/chrome/test.xul rename : testing/marionette/client/marionette/chrome/test2.xul => testing/marionette/harness/marionette/chrome/test2.xul rename : testing/marionette/client/marionette/chrome/test_anonymous_content.xul => testing/marionette/harness/marionette/chrome/test_anonymous_content.xul rename : testing/marionette/client/marionette/chrome/test_nested_iframe.xul => testing/marionette/harness/marionette/chrome/test_nested_iframe.xul rename : testing/marionette/client/marionette/marionette_test.py => testing/marionette/harness/marionette/marionette_test.py rename : testing/marionette/client/marionette/runner/__init__.py => testing/marionette/harness/marionette/runner/__init__.py rename : testing/marionette/client/marionette/runner/base.py => testing/marionette/harness/marionette/runner/base.py rename : testing/marionette/client/marionette/runner/httpd.py => testing/marionette/harness/marionette/runner/httpd.py rename : testing/marionette/client/marionette/runner/mixins/__init__.py => testing/marionette/harness/marionette/runner/mixins/__init__.py rename : testing/marionette/client/marionette/runner/mixins/b2g.py => testing/marionette/harness/marionette/runner/mixins/b2g.py rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/History.md => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/History.md rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/browsermobproxy/__init__.py => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/browsermobproxy/__init__.py rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/browsermobproxy/client.py => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/browsermobproxy/client.py rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/browsermobproxy/server.py => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/browsermobproxy/server.py rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/browsermobproxy/webdriver_event_listener.py => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/browsermobproxy/webdriver_event_listener.py rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/Makefile => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/Makefile rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/.buildinfo => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/.buildinfo rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_modules/browsermobproxy.html => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_modules/browsermobproxy.html rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_modules/index.html => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_modules/index.html rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_sources/client.txt => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_sources/client.txt rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_sources/index.txt => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_sources/index.txt rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_sources/server.txt => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_sources/server.txt rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/basic.css => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/basic.css rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/default.css => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/default.css rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/doctools.js => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/doctools.js rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/jquery.js => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/jquery.js rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/pygments.css => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/pygments.css rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/searchtools.js => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/searchtools.js rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/sidebar.js => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/sidebar.js rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/underscore.js => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/underscore.js rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/websupport.js => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/_static/websupport.js rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/client.html => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/client.html rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/genindex.html => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/genindex.html rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/index.html => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/index.html rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/objects.inv => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/objects.inv rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/py-modindex.html => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/py-modindex.html rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/search.html => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/search.html rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/searchindex.js => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/searchindex.js rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/server.html => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/_build/html/server.html rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/client.rst => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/client.rst rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/conf.py => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/conf.py rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/index.rst => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/index.rst rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/make.bat => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/make.bat rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/docs/server.rst => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/docs/server.rst rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/readme.md => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/readme.md rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/setup.py => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/setup.py rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/test/test_client.py => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/test/test_client.py rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/test/test_remote.py => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/test/test_remote.py rename : testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py/test/test_webdriver.py => testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py/test/test_webdriver.py rename : testing/marionette/client/marionette/runner/mixins/browsermob.py => testing/marionette/harness/marionette/runner/mixins/browsermob.py rename : testing/marionette/client/marionette/runner/mixins/endurance.py => testing/marionette/harness/marionette/runner/mixins/endurance.py rename : testing/marionette/client/marionette/runner/mixins/reporting.py => testing/marionette/harness/marionette/runner/mixins/reporting.py rename : testing/marionette/client/marionette/runner/mixins/resources/htmlreport/jquery.js => testing/marionette/harness/marionette/runner/mixins/resources/htmlreport/jquery.js rename : testing/marionette/client/marionette/runner/mixins/resources/htmlreport/main.js => testing/marionette/harness/marionette/runner/mixins/resources/htmlreport/main.js rename : testing/marionette/client/marionette/runner/mixins/resources/htmlreport/style.css => testing/marionette/harness/marionette/runner/mixins/resources/htmlreport/style.css rename : testing/marionette/client/marionette/runner/mixins/xmlgen.py => testing/marionette/harness/marionette/runner/mixins/xmlgen.py rename : testing/marionette/client/marionette/runtests.py => testing/marionette/harness/marionette/runtests.py rename : testing/marionette/client/marionette/tests/print-manifest-dirs.py => testing/marionette/harness/marionette/tests/print-manifest-dirs.py rename : testing/marionette/client/marionette/tests/unit-tests.ini => testing/marionette/harness/marionette/tests/unit-tests.ini rename : testing/marionette/client/marionette/tests/unit/importanotherscript.js => testing/marionette/harness/marionette/tests/unit/importanotherscript.js rename : testing/marionette/client/marionette/tests/unit/importscript.js => testing/marionette/harness/marionette/tests/unit/importscript.js rename : testing/marionette/client/marionette/tests/unit/mn-restartless-unsigned.xpi => testing/marionette/harness/marionette/tests/unit/mn-restartless-unsigned.xpi rename : testing/marionette/client/marionette/tests/unit/single_finger_functions.py => testing/marionette/harness/marionette/tests/unit/single_finger_functions.py rename : testing/marionette/client/marionette/tests/unit/test_about_pages.py => testing/marionette/harness/marionette/tests/unit/test_about_pages.py rename : testing/marionette/client/marionette/tests/unit/test_accessibility.py => testing/marionette/harness/marionette/tests/unit/test_accessibility.py rename : testing/marionette/client/marionette/tests/unit/test_addons.py => testing/marionette/harness/marionette/tests/unit/test_addons.py rename : testing/marionette/client/marionette/tests/unit/test_anonymous_content.py => testing/marionette/harness/marionette/tests/unit/test_anonymous_content.py rename : testing/marionette/client/marionette/tests/unit/test_browsermobproxy.py => testing/marionette/harness/marionette/tests/unit/test_browsermobproxy.py rename : testing/marionette/client/marionette/tests/unit/test_capabilities.py => testing/marionette/harness/marionette/tests/unit/test_capabilities.py rename : testing/marionette/client/marionette/tests/unit/test_chrome.py => testing/marionette/harness/marionette/tests/unit/test_chrome.py rename : testing/marionette/client/marionette/tests/unit/test_chrome_async_finish.js => testing/marionette/harness/marionette/tests/unit/test_chrome_async_finish.js rename : testing/marionette/client/marionette/tests/unit/test_chrome_element_css.py => testing/marionette/harness/marionette/tests/unit/test_chrome_element_css.py rename : testing/marionette/client/marionette/tests/unit/test_clearing.py => testing/marionette/harness/marionette/tests/unit/test_clearing.py rename : testing/marionette/client/marionette/tests/unit/test_click.py => testing/marionette/harness/marionette/tests/unit/test_click.py rename : testing/marionette/client/marionette/tests/unit/test_click_chrome.py => testing/marionette/harness/marionette/tests/unit/test_click_chrome.py rename : testing/marionette/client/marionette/tests/unit/test_click_scrolling.py => testing/marionette/harness/marionette/tests/unit/test_click_scrolling.py rename : testing/marionette/client/marionette/tests/unit/test_cookies.py => testing/marionette/harness/marionette/tests/unit/test_cookies.py rename : testing/marionette/client/marionette/tests/unit/test_data_driven.py => testing/marionette/harness/marionette/tests/unit/test_data_driven.py rename : testing/marionette/client/marionette/tests/unit/test_date_time_value.py => testing/marionette/harness/marionette/tests/unit/test_date_time_value.py rename : testing/marionette/client/marionette/tests/unit/test_elementState.py => testing/marionette/harness/marionette/tests/unit/test_elementState.py rename : testing/marionette/client/marionette/tests/unit/test_elementState_chrome.py => testing/marionette/harness/marionette/tests/unit/test_elementState_chrome.py rename : testing/marionette/client/marionette/tests/unit/test_element_touch.py => testing/marionette/harness/marionette/tests/unit/test_element_touch.py rename : testing/marionette/client/marionette/tests/unit/test_elementsize.py => testing/marionette/harness/marionette/tests/unit/test_elementsize.py rename : testing/marionette/client/marionette/tests/unit/test_emulator.py => testing/marionette/harness/marionette/tests/unit/test_emulator.py rename : testing/marionette/client/marionette/tests/unit/test_errors.py => testing/marionette/harness/marionette/tests/unit/test_errors.py rename : testing/marionette/client/marionette/tests/unit/test_execute_async_script.py => testing/marionette/harness/marionette/tests/unit/test_execute_async_script.py rename : testing/marionette/client/marionette/tests/unit/test_execute_isolate.py => testing/marionette/harness/marionette/tests/unit/test_execute_isolate.py rename : testing/marionette/client/marionette/tests/unit/test_execute_sandboxes.py => testing/marionette/harness/marionette/tests/unit/test_execute_sandboxes.py rename : testing/marionette/client/marionette/tests/unit/test_execute_script.py => testing/marionette/harness/marionette/tests/unit/test_execute_script.py rename : testing/marionette/client/marionette/tests/unit/test_expected.py => testing/marionette/harness/marionette/tests/unit/test_expected.py rename : testing/marionette/client/marionette/tests/unit/test_expectedfail.py => testing/marionette/harness/marionette/tests/unit/test_expectedfail.py rename : testing/marionette/client/marionette/tests/unit/test_file_upload.py => testing/marionette/harness/marionette/tests/unit/test_file_upload.py rename : testing/marionette/client/marionette/tests/unit/test_findelement.py => testing/marionette/harness/marionette/tests/unit/test_findelement.py rename : testing/marionette/client/marionette/tests/unit/test_findelement_chrome.py => testing/marionette/harness/marionette/tests/unit/test_findelement_chrome.py rename : testing/marionette/client/marionette/tests/unit/test_gesture.py => testing/marionette/harness/marionette/tests/unit/test_gesture.py rename : testing/marionette/client/marionette/tests/unit/test_getactiveframe_oop.py => testing/marionette/harness/marionette/tests/unit/test_getactiveframe_oop.py rename : testing/marionette/client/marionette/tests/unit/test_getattr.py => testing/marionette/harness/marionette/tests/unit/test_getattr.py rename : testing/marionette/client/marionette/tests/unit/test_getattr_chrome.py => testing/marionette/harness/marionette/tests/unit/test_getattr_chrome.py rename : testing/marionette/client/marionette/tests/unit/test_implicit_waits.py => testing/marionette/harness/marionette/tests/unit/test_implicit_waits.py rename : testing/marionette/client/marionette/tests/unit/test_import_script.py => testing/marionette/harness/marionette/tests/unit/test_import_script.py rename : testing/marionette/client/marionette/tests/unit/test_import_script_reuse_window.py => testing/marionette/harness/marionette/tests/unit/test_import_script_reuse_window.py rename : testing/marionette/client/marionette/tests/unit/test_key_actions.py => testing/marionette/harness/marionette/tests/unit/test_key_actions.py rename : testing/marionette/client/marionette/tests/unit/test_log.py => testing/marionette/harness/marionette/tests/unit/test_log.py rename : testing/marionette/client/marionette/tests/unit/test_marionette.py => testing/marionette/harness/marionette/tests/unit/test_marionette.py rename : testing/marionette/client/marionette/tests/unit/test_modal_dialogs.py => testing/marionette/harness/marionette/tests/unit/test_modal_dialogs.py rename : testing/marionette/client/marionette/tests/unit/test_mouse_action.py => testing/marionette/harness/marionette/tests/unit/test_mouse_action.py rename : testing/marionette/client/marionette/tests/unit/test_multi_finger.py => testing/marionette/harness/marionette/tests/unit/test_multi_finger.py rename : testing/marionette/client/marionette/tests/unit/test_navigation.py => testing/marionette/harness/marionette/tests/unit/test_navigation.py rename : testing/marionette/client/marionette/tests/unit/test_pagesource.py => testing/marionette/harness/marionette/tests/unit/test_pagesource.py rename : testing/marionette/client/marionette/tests/unit/test_position.py => testing/marionette/harness/marionette/tests/unit/test_position.py rename : testing/marionette/client/marionette/tests/unit/test_profile_management.py => testing/marionette/harness/marionette/tests/unit/test_profile_management.py rename : testing/marionette/client/marionette/tests/unit/test_proxy.py => testing/marionette/harness/marionette/tests/unit/test_proxy.py rename : testing/marionette/client/marionette/tests/unit/test_rendered_element.py => testing/marionette/harness/marionette/tests/unit/test_rendered_element.py rename : testing/marionette/client/marionette/tests/unit/test_report.py => testing/marionette/harness/marionette/tests/unit/test_report.py rename : testing/marionette/client/marionette/tests/unit/test_run_js_test.py => testing/marionette/harness/marionette/tests/unit/test_run_js_test.py rename : testing/marionette/client/marionette/tests/unit/test_screen_orientation.py => testing/marionette/harness/marionette/tests/unit/test_screen_orientation.py rename : testing/marionette/client/marionette/tests/unit/test_screenshot.py => testing/marionette/harness/marionette/tests/unit/test_screenshot.py rename : testing/marionette/client/marionette/tests/unit/test_selected.py => testing/marionette/harness/marionette/tests/unit/test_selected.py rename : testing/marionette/client/marionette/tests/unit/test_selected_chrome.py => testing/marionette/harness/marionette/tests/unit/test_selected_chrome.py rename : testing/marionette/client/marionette/tests/unit/test_session.py => testing/marionette/harness/marionette/tests/unit/test_session.py rename : testing/marionette/client/marionette/tests/unit/test_set_window_size.py => testing/marionette/harness/marionette/tests/unit/test_set_window_size.py rename : testing/marionette/client/marionette/tests/unit/test_shadow_dom.py => testing/marionette/harness/marionette/tests/unit/test_shadow_dom.py rename : testing/marionette/client/marionette/tests/unit/test_simpletest_chrome.js => testing/marionette/harness/marionette/tests/unit/test_simpletest_chrome.js rename : testing/marionette/client/marionette/tests/unit/test_simpletest_fail.js => testing/marionette/harness/marionette/tests/unit/test_simpletest_fail.js rename : testing/marionette/client/marionette/tests/unit/test_simpletest_pass.js => testing/marionette/harness/marionette/tests/unit/test_simpletest_pass.js rename : testing/marionette/client/marionette/tests/unit/test_simpletest_sanity.py => testing/marionette/harness/marionette/tests/unit/test_simpletest_sanity.py rename : testing/marionette/client/marionette/tests/unit/test_simpletest_timeout.js => testing/marionette/harness/marionette/tests/unit/test_simpletest_timeout.js rename : testing/marionette/client/marionette/tests/unit/test_single_finger.py => testing/marionette/harness/marionette/tests/unit/test_single_finger.py rename : testing/marionette/client/marionette/tests/unit/test_single_finger_desktop.py => testing/marionette/harness/marionette/tests/unit/test_single_finger_desktop.py rename : testing/marionette/client/marionette/tests/unit/test_skip_setup.py => testing/marionette/harness/marionette/tests/unit/test_skip_setup.py rename : testing/marionette/client/marionette/tests/unit/test_switch_frame.py => testing/marionette/harness/marionette/tests/unit/test_switch_frame.py rename : testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py => testing/marionette/harness/marionette/tests/unit/test_switch_frame_chrome.py rename : testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py => testing/marionette/harness/marionette/tests/unit/test_switch_remote_frame.py rename : testing/marionette/client/marionette/tests/unit/test_teardown_context_preserved.py => testing/marionette/harness/marionette/tests/unit/test_teardown_context_preserved.py rename : testing/marionette/client/marionette/tests/unit/test_text.py => testing/marionette/harness/marionette/tests/unit/test_text.py rename : testing/marionette/client/marionette/tests/unit/test_text_chrome.py => testing/marionette/harness/marionette/tests/unit/test_text_chrome.py rename : testing/marionette/client/marionette/tests/unit/test_timeouts.py => testing/marionette/harness/marionette/tests/unit/test_timeouts.py rename : testing/marionette/client/marionette/tests/unit/test_transport.py => testing/marionette/harness/marionette/tests/unit/test_transport.py rename : testing/marionette/client/marionette/tests/unit/test_typing.py => testing/marionette/harness/marionette/tests/unit/test_typing.py rename : testing/marionette/client/marionette/tests/unit/test_using_permissions.py => testing/marionette/harness/marionette/tests/unit/test_using_permissions.py rename : testing/marionette/client/marionette/tests/unit/test_using_prefs.py => testing/marionette/harness/marionette/tests/unit/test_using_prefs.py rename : testing/marionette/client/marionette/tests/unit/test_visibility.py => testing/marionette/harness/marionette/tests/unit/test_visibility.py rename : testing/marionette/client/marionette/tests/unit/test_wait.py => testing/marionette/harness/marionette/tests/unit/test_wait.py rename : testing/marionette/client/marionette/tests/unit/test_window_handles.py => testing/marionette/harness/marionette/tests/unit/test_window_handles.py rename : testing/marionette/client/marionette/tests/unit/test_window_management.py => testing/marionette/harness/marionette/tests/unit/test_window_management.py rename : testing/marionette/client/marionette/tests/unit/test_window_position.py => testing/marionette/harness/marionette/tests/unit/test_window_position.py rename : testing/marionette/client/marionette/tests/unit/test_window_switching.py => testing/marionette/harness/marionette/tests/unit/test_window_switching.py rename : testing/marionette/client/marionette/tests/unit/test_window_title.py => testing/marionette/harness/marionette/tests/unit/test_window_title.py rename : testing/marionette/client/marionette/tests/unit/test_window_type.py => testing/marionette/harness/marionette/tests/unit/test_window_type.py rename : testing/marionette/client/marionette/tests/unit/test_with_using_context.py => testing/marionette/harness/marionette/tests/unit/test_with_using_context.py rename : testing/marionette/client/marionette/tests/unit/unit-tests.ini => testing/marionette/harness/marionette/tests/unit/unit-tests.ini rename : testing/marionette/client/marionette/tests/update-tests.ini => testing/marionette/harness/marionette/tests/update-tests.ini rename : testing/marionette/client/marionette/tests/webapi-tests.ini => testing/marionette/harness/marionette/tests/webapi-tests.ini rename : testing/marionette/client/marionette/venv_b2g_update_test.sh => testing/marionette/harness/marionette/venv_b2g_update_test.sh rename : testing/marionette/client/marionette/www/bug814037.html => testing/marionette/harness/marionette/www/bug814037.html rename : testing/marionette/client/marionette/www/click_out_of_bounds_overflow.html => testing/marionette/harness/marionette/www/click_out_of_bounds_overflow.html rename : testing/marionette/client/marionette/www/clicks.html => testing/marionette/harness/marionette/www/clicks.html rename : testing/marionette/client/marionette/www/cssTransform.html => testing/marionette/harness/marionette/www/cssTransform.html rename : testing/marionette/client/marionette/www/cssTransform2.html => testing/marionette/harness/marionette/www/cssTransform2.html rename : testing/marionette/client/marionette/www/datetimePage.html => testing/marionette/harness/marionette/www/datetimePage.html rename : testing/marionette/client/marionette/www/deletingFrame.html => testing/marionette/harness/marionette/www/deletingFrame.html rename : testing/marionette/client/marionette/www/double_click.html => testing/marionette/harness/marionette/www/double_click.html rename : testing/marionette/client/marionette/www/element_bottom.html => testing/marionette/harness/marionette/www/element_bottom.html rename : testing/marionette/client/marionette/www/element_left.html => testing/marionette/harness/marionette/www/element_left.html rename : testing/marionette/client/marionette/www/element_outside_viewport.html => testing/marionette/harness/marionette/www/element_outside_viewport.html rename : testing/marionette/client/marionette/www/element_right.html => testing/marionette/harness/marionette/www/element_right.html rename : testing/marionette/client/marionette/www/element_top.html => testing/marionette/harness/marionette/www/element_top.html rename : testing/marionette/client/marionette/www/empty.html => testing/marionette/harness/marionette/www/empty.html rename : testing/marionette/client/marionette/www/formPage.html => testing/marionette/harness/marionette/www/formPage.html rename : testing/marionette/client/marionette/www/frameset.html => testing/marionette/harness/marionette/www/frameset.html rename : testing/marionette/client/marionette/www/framesetPage2.html => testing/marionette/harness/marionette/www/framesetPage2.html rename : testing/marionette/client/marionette/www/hidden.html => testing/marionette/harness/marionette/www/hidden.html rename : testing/marionette/client/marionette/www/html5/blue.jpg => testing/marionette/harness/marionette/www/html5/blue.jpg rename : testing/marionette/client/marionette/www/html5/boolean_attributes.html => testing/marionette/harness/marionette/www/html5/boolean_attributes.html rename : testing/marionette/client/marionette/www/html5/geolocation.js => testing/marionette/harness/marionette/www/html5/geolocation.js rename : testing/marionette/client/marionette/www/html5/green.jpg => testing/marionette/harness/marionette/www/html5/green.jpg rename : testing/marionette/client/marionette/www/html5/offline.html => testing/marionette/harness/marionette/www/html5/offline.html rename : testing/marionette/client/marionette/www/html5/red.jpg => testing/marionette/harness/marionette/www/html5/red.jpg rename : testing/marionette/client/marionette/www/html5/status.html => testing/marionette/harness/marionette/www/html5/status.html rename : testing/marionette/client/marionette/www/html5/test.appcache => testing/marionette/harness/marionette/www/html5/test.appcache rename : testing/marionette/client/marionette/www/html5/test_html_inputs.html => testing/marionette/harness/marionette/www/html5/test_html_inputs.html rename : testing/marionette/client/marionette/www/html5/yellow.jpg => testing/marionette/harness/marionette/www/html5/yellow.jpg rename : testing/marionette/client/marionette/www/html5Page.html => testing/marionette/harness/marionette/www/html5Page.html rename : testing/marionette/client/marionette/www/javascriptPage.html => testing/marionette/harness/marionette/www/javascriptPage.html rename : testing/marionette/client/marionette/www/macbeth.html => testing/marionette/harness/marionette/www/macbeth.html rename : testing/marionette/client/marionette/www/modal_dialogs.html => testing/marionette/harness/marionette/www/modal_dialogs.html rename : testing/marionette/client/marionette/www/nestedElements.html => testing/marionette/harness/marionette/www/nestedElements.html rename : testing/marionette/client/marionette/www/rectangles.html => testing/marionette/harness/marionette/www/rectangles.html rename : testing/marionette/client/marionette/www/resultPage.html => testing/marionette/harness/marionette/www/resultPage.html rename : testing/marionette/client/marionette/www/scroll.html => testing/marionette/harness/marionette/www/scroll.html rename : testing/marionette/client/marionette/www/scroll2.html => testing/marionette/harness/marionette/www/scroll2.html rename : testing/marionette/client/marionette/www/scroll3.html => testing/marionette/harness/marionette/www/scroll3.html rename : testing/marionette/client/marionette/www/scroll4.html => testing/marionette/harness/marionette/www/scroll4.html rename : testing/marionette/client/marionette/www/scroll5.html => testing/marionette/harness/marionette/www/scroll5.html rename : testing/marionette/client/marionette/www/shim.js => testing/marionette/harness/marionette/www/shim.js rename : testing/marionette/client/marionette/www/test.html => testing/marionette/harness/marionette/www/test.html rename : testing/marionette/client/marionette/www/testAction.html => testing/marionette/harness/marionette/www/testAction.html rename : testing/marionette/client/marionette/www/testPageSource.html => testing/marionette/harness/marionette/www/testPageSource.html rename : testing/marionette/client/marionette/www/testPageSource.xml => testing/marionette/harness/marionette/www/testPageSource.xml rename : testing/marionette/client/marionette/www/testPageSourceWithUnicodeChars.html => testing/marionette/harness/marionette/www/testPageSourceWithUnicodeChars.html rename : testing/marionette/client/marionette/www/testSize.html => testing/marionette/harness/marionette/www/testSize.html rename : testing/marionette/client/marionette/www/test_accessibility.html => testing/marionette/harness/marionette/www/test_accessibility.html rename : testing/marionette/client/marionette/www/test_carets_display_none.html => testing/marionette/harness/marionette/www/test_carets_display_none.html rename : testing/marionette/client/marionette/www/test_clearing.html => testing/marionette/harness/marionette/www/test_clearing.html rename : testing/marionette/client/marionette/www/test_dynamic.html => testing/marionette/harness/marionette/www/test_dynamic.html rename : testing/marionette/client/marionette/www/test_iframe.html => testing/marionette/harness/marionette/www/test_iframe.html rename : testing/marionette/client/marionette/www/test_inner_iframe.html => testing/marionette/harness/marionette/www/test_inner_iframe.html rename : testing/marionette/client/marionette/www/test_nested_iframe.html => testing/marionette/harness/marionette/www/test_nested_iframe.html rename : testing/marionette/client/marionette/www/test_oop_1.html => testing/marionette/harness/marionette/www/test_oop_1.html rename : testing/marionette/client/marionette/www/test_oop_2.html => testing/marionette/harness/marionette/www/test_oop_2.html rename : testing/marionette/client/marionette/www/test_selectioncarets.html => testing/marionette/harness/marionette/www/test_selectioncarets.html rename : testing/marionette/client/marionette/www/test_selectioncarets_iframe.html => testing/marionette/harness/marionette/www/test_selectioncarets_iframe.html rename : testing/marionette/client/marionette/www/test_selectioncarets_longtext.html => testing/marionette/harness/marionette/www/test_selectioncarets_longtext.html rename : testing/marionette/client/marionette/www/test_selectioncarets_multipleline.html => testing/marionette/harness/marionette/www/test_selectioncarets_multipleline.html rename : testing/marionette/client/marionette/www/test_selectioncarets_multiplerange.html => testing/marionette/harness/marionette/www/test_selectioncarets_multiplerange.html rename : testing/marionette/client/marionette/www/test_shadow_dom.html => testing/marionette/harness/marionette/www/test_shadow_dom.html rename : testing/marionette/client/marionette/www/test_touchcaret.html => testing/marionette/harness/marionette/www/test_touchcaret.html rename : testing/marionette/client/marionette/www/test_windows.html => testing/marionette/harness/marionette/www/test_windows.html rename : testing/marionette/client/marionette/www/windowHandles.html => testing/marionette/harness/marionette/www/windowHandles.html rename : testing/marionette/client/marionette/www/xhtmlTest.html => testing/marionette/harness/marionette/www/xhtmlTest.html rename : testing/marionette/client/requirements.txt => testing/marionette/harness/requirements.txt rename : testing/marionette/client/setup.py => testing/marionette/harness/setup.py extra : rebase_source : 2e2cb0e1b959bade8423f00f848995767bd5435f
2016-02-06 20:34:10 +03:00
'testing/marionette/harness',
'testing/marionette/harness/marionette/runner/mixins/browsermob-proxy-py',
Bug 1319705 - Move Puppeteer to testing/marionette and make it available for Marionette tests in test packages. r=gps MozReview-Commit-ID: 521o0fV72SQ --HG-- rename : testing/puppeteer/.flake8 => testing/marionette/puppeteer/.flake8 rename : testing/puppeteer/firefox/MANIFEST.in => testing/marionette/puppeteer/firefox/MANIFEST.in rename : testing/puppeteer/firefox/docs/Makefile => testing/marionette/puppeteer/firefox/docs/Makefile rename : testing/puppeteer/firefox/docs/api/appinfo.rst => testing/marionette/puppeteer/firefox/docs/api/appinfo.rst rename : testing/puppeteer/firefox/docs/api/keys.rst => testing/marionette/puppeteer/firefox/docs/api/keys.rst rename : testing/puppeteer/firefox/docs/api/l10n.rst => testing/marionette/puppeteer/firefox/docs/api/l10n.rst rename : testing/puppeteer/firefox/docs/api/places.rst => testing/marionette/puppeteer/firefox/docs/api/places.rst rename : testing/puppeteer/firefox/docs/api/prefs.rst => testing/marionette/puppeteer/firefox/docs/api/prefs.rst rename : testing/puppeteer/firefox/docs/api/security.rst => testing/marionette/puppeteer/firefox/docs/api/security.rst rename : testing/puppeteer/firefox/docs/api/software_update.rst => testing/marionette/puppeteer/firefox/docs/api/software_update.rst rename : testing/puppeteer/firefox/docs/api/utils.rst => testing/marionette/puppeteer/firefox/docs/api/utils.rst rename : testing/puppeteer/firefox/docs/conf.py => testing/marionette/puppeteer/firefox/docs/conf.py rename : testing/puppeteer/firefox/docs/index.rst => testing/marionette/puppeteer/firefox/docs/index.rst rename : testing/puppeteer/firefox/docs/make.bat => testing/marionette/puppeteer/firefox/docs/make.bat rename : testing/puppeteer/firefox/docs/ui/about_window/window.rst => testing/marionette/puppeteer/firefox/docs/ui/about_window/window.rst rename : testing/puppeteer/firefox/docs/ui/browser/notifications.rst => testing/marionette/puppeteer/firefox/docs/ui/browser/notifications.rst rename : testing/puppeteer/firefox/docs/ui/browser/tabbar.rst => testing/marionette/puppeteer/firefox/docs/ui/browser/tabbar.rst rename : testing/puppeteer/firefox/docs/ui/browser/toolbars.rst => testing/marionette/puppeteer/firefox/docs/ui/browser/toolbars.rst rename : testing/puppeteer/firefox/docs/ui/browser/window.rst => testing/marionette/puppeteer/firefox/docs/ui/browser/window.rst rename : testing/puppeteer/firefox/docs/ui/deck.rst => testing/marionette/puppeteer/firefox/docs/ui/deck.rst rename : testing/puppeteer/firefox/docs/ui/menu.rst => testing/marionette/puppeteer/firefox/docs/ui/menu.rst rename : testing/puppeteer/firefox/docs/ui/pageinfo/window.rst => testing/marionette/puppeteer/firefox/docs/ui/pageinfo/window.rst rename : testing/puppeteer/firefox/docs/ui/update_wizard/dialog.rst => testing/marionette/puppeteer/firefox/docs/ui/update_wizard/dialog.rst rename : testing/puppeteer/firefox/docs/ui/windows.rst => testing/marionette/puppeteer/firefox/docs/ui/windows.rst rename : testing/puppeteer/firefox/firefox_puppeteer/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/appinfo.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/appinfo.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/keys.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/keys.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/l10n.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/l10n.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/places.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/places.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/prefs.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/prefs.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/security.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/security.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/software_update.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/software_update.py rename : testing/puppeteer/firefox/firefox_puppeteer/api/utils.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/api/utils.py rename : testing/puppeteer/firefox/firefox_puppeteer/base.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/base.py rename : testing/puppeteer/firefox/firefox_puppeteer/decorators.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/decorators.py rename : testing/puppeteer/firefox/firefox_puppeteer/errors.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/errors.py rename : testing/puppeteer/firefox/firefox_puppeteer/mixins.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/mixins.py rename : testing/puppeteer/firefox/firefox_puppeteer/puppeteer.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/puppeteer.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/about_window/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/about_window/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/about_window/deck.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/about_window/deck.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/about_window/window.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/about_window/window.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/base.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/base.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/browser/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/browser/notifications.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/notifications.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/browser/tabbar.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/tabbar.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/browser/toolbars.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/toolbars.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/deck.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/deck.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/menu.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/menu.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/deck.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/deck.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/window.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/pageinfo/window.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/__init__.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/__init__.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/dialog.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/dialog.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/wizard.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/wizard.py rename : testing/puppeteer/firefox/firefox_puppeteer/ui/windows.py => testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/windows.py rename : testing/puppeteer/firefox/requirements-docs.txt => testing/marionette/puppeteer/firefox/requirements-docs.txt rename : testing/puppeteer/firefox/requirements.txt => testing/marionette/puppeteer/firefox/requirements.txt rename : testing/puppeteer/firefox/setup.py => testing/marionette/puppeteer/firefox/setup.py extra : rebase_source : 2c34436c2669cab33d7d3b3f2b23c46c7d3a27d7
2016-11-24 19:02:52 +03:00
'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',
'testing/mozbase/mozlog',
'testing/mozbase/moznetwork',
'testing/mozbase/mozprocess',
'testing/mozbase/mozprofile',
'testing/mozbase/mozrunner',
'testing/mozbase/mozsystemmonitor',
'testing/mozbase/mozscreenshot',
'testing/mozbase/moztest',
'testing/mozbase/mozversion',
Bug 984528 - Rename manifestdestiny -> manifestparser. r=ahal --HG-- rename : testing/mozbase/docs/manifestdestiny.rst => testing/mozbase/docs/manifestparser.rst rename : testing/mozbase/manifestdestiny/manifestparser/__init__.py => testing/mozbase/manifestparser/manifestparser/__init__.py rename : testing/mozbase/manifestdestiny/manifestparser/manifestparser.py => testing/mozbase/manifestparser/manifestparser/manifestparser.py rename : testing/mozbase/manifestdestiny/setup.py => testing/mozbase/manifestparser/setup.py rename : testing/mozbase/manifestdestiny/tests/comment-example.ini => testing/mozbase/manifestparser/tests/comment-example.ini rename : testing/mozbase/manifestdestiny/tests/default-skipif.ini => testing/mozbase/manifestparser/tests/default-skipif.ini rename : testing/mozbase/manifestdestiny/tests/filter-example.ini => testing/mozbase/manifestparser/tests/filter-example.ini rename : testing/mozbase/manifestdestiny/tests/fleem => testing/mozbase/manifestparser/tests/fleem rename : testing/mozbase/manifestdestiny/tests/include-example.ini => testing/mozbase/manifestparser/tests/include-example.ini rename : testing/mozbase/manifestdestiny/tests/include/bar.ini => testing/mozbase/manifestparser/tests/include/bar.ini rename : testing/mozbase/manifestdestiny/tests/include/crash-handling => testing/mozbase/manifestparser/tests/include/crash-handling rename : testing/mozbase/manifestdestiny/tests/include/flowers => testing/mozbase/manifestparser/tests/include/flowers rename : testing/mozbase/manifestdestiny/tests/include/foo.ini => testing/mozbase/manifestparser/tests/include/foo.ini rename : testing/mozbase/manifestdestiny/tests/just-defaults.ini => testing/mozbase/manifestparser/tests/just-defaults.ini rename : testing/mozbase/manifestdestiny/tests/manifest.ini => testing/mozbase/manifestparser/tests/manifest.ini rename : testing/mozbase/manifestdestiny/tests/mozmill-example.ini => testing/mozbase/manifestparser/tests/mozmill-example.ini rename : testing/mozbase/manifestdestiny/tests/mozmill-restart-example.ini => testing/mozbase/manifestparser/tests/mozmill-restart-example.ini rename : testing/mozbase/manifestdestiny/tests/no-tests.ini => testing/mozbase/manifestparser/tests/no-tests.ini rename : testing/mozbase/manifestdestiny/tests/path-example.ini => testing/mozbase/manifestparser/tests/path-example.ini rename : testing/mozbase/manifestdestiny/tests/relative-path.ini => testing/mozbase/manifestparser/tests/relative-path.ini rename : testing/mozbase/manifestdestiny/tests/test_convert_directory.py => testing/mozbase/manifestparser/tests/test_convert_directory.py rename : testing/mozbase/manifestdestiny/tests/test_convert_symlinks.py => testing/mozbase/manifestparser/tests/test_convert_symlinks.py rename : testing/mozbase/manifestdestiny/tests/test_default_skipif.py => testing/mozbase/manifestparser/tests/test_default_skipif.py rename : testing/mozbase/manifestdestiny/tests/test_expressionparser.py => testing/mozbase/manifestparser/tests/test_expressionparser.py rename : testing/mozbase/manifestdestiny/tests/test_manifestparser.py => testing/mozbase/manifestparser/tests/test_manifestparser.py rename : testing/mozbase/manifestdestiny/tests/test_read_ini.py => testing/mozbase/manifestparser/tests/test_read_ini.py rename : testing/mozbase/manifestdestiny/tests/test_testmanifest.py => testing/mozbase/manifestparser/tests/test_testmanifest.py rename : testing/mozbase/manifestdestiny/tests/verifyDirectory/subdir/manifest.ini => testing/mozbase/manifestparser/tests/verifyDirectory/subdir/manifest.ini rename : testing/mozbase/manifestdestiny/tests/verifyDirectory/subdir/test_sub.js => testing/mozbase/manifestparser/tests/verifyDirectory/subdir/test_sub.js rename : testing/mozbase/manifestdestiny/tests/verifyDirectory/test_1.js => testing/mozbase/manifestparser/tests/verifyDirectory/test_1.js rename : testing/mozbase/manifestdestiny/tests/verifyDirectory/test_2.js => testing/mozbase/manifestparser/tests/verifyDirectory/test_2.js rename : testing/mozbase/manifestdestiny/tests/verifyDirectory/test_3.js => testing/mozbase/manifestparser/tests/verifyDirectory/test_3.js rename : testing/mozbase/manifestdestiny/tests/verifyDirectory/verifyDirectory.ini => testing/mozbase/manifestparser/tests/verifyDirectory/verifyDirectory.ini rename : testing/mozbase/manifestdestiny/tests/verifyDirectory/verifyDirectory_incomplete.ini => testing/mozbase/manifestparser/tests/verifyDirectory/verifyDirectory_incomplete.ini rename : testing/mozbase/manifestdestiny/tests/verifyDirectory/verifyDirectory_toocomplete.ini => testing/mozbase/manifestparser/tests/verifyDirectory/verifyDirectory_toocomplete.ini
2014-06-10 21:20:23 +04:00
'testing/mozbase/manifestparser',
'testing/taskcluster',
'testing/tools/autotry',
'testing/web-platform',
'testing/web-platform/harness',
'testing/web-platform/tests/tools/wptserve',
'testing/xpcshell',
'xpcom/idl-parser',
]
# Individual files providing mach commands.
MACH_MODULES = [
'addon-sdk/mach_commands.py',
'build/valgrind/mach_commands.py',
'devtools/shared/css/generated/mach_commands.py',
'dom/bindings/mach_commands.py',
'dom/media/test/external/mach_commands.py',
'layout/tools/reftest/mach_commands.py',
'python/mach_commands.py',
'python/mach/mach/commands/commandinfo.py',
'python/mach/mach/commands/settings.py',
'python/compare-locales/mach_commands.py',
'python/mozboot/mozboot/mach_commands.py',
'python/mozbuild/mozbuild/mach_commands.py',
'python/mozbuild/mozbuild/backend/mach_commands.py',
'python/mozbuild/mozbuild/compilation/codecomplete.py',
'python/mozbuild/mozbuild/frontend/mach_commands.py',
'services/common/tests/mach_commands.py',
'taskcluster/mach_commands.py',
'testing/firefox-ui/mach_commands.py',
'testing/mach_commands.py',
'testing/marionette/mach_commands.py',
'testing/mochitest/mach_commands.py',
'testing/mozharness/mach_commands.py',
'testing/talos/mach_commands.py',
'testing/web-platform/mach_commands.py',
'testing/xpcshell/mach_commands.py',
'tools/docs/mach_commands.py',
'tools/lint/mach_commands.py',
'tools/mach_commands.py',
'tools/power/mach_commands.py',
'mobile/android/mach_commands.py',
]
CATEGORIES = {
'build': {
'short': 'Build Commands',
'long': 'Interact with the build system',
'priority': 80,
},
'post-build': {
'short': 'Post-build Commands',
'long': 'Common actions performed after completing a build.',
'priority': 70,
},
'testing': {
'short': 'Testing',
'long': 'Run tests.',
'priority': 60,
},
'ci': {
'short': 'CI',
'long': 'Taskcluster commands',
'priority': 59
},
'devenv': {
'short': 'Development Environment',
'long': 'Set up and configure your development environment.',
'priority': 50,
},
'build-dev': {
'short': 'Low-level Build System Interaction',
'long': 'Interact with specific parts of the build system.',
'priority': 20,
},
'misc': {
'short': 'Potpourri',
'long': 'Potent potables and assorted snacks.',
'priority': 10,
},
'disabled': {
'short': 'Disabled',
'long': 'The disabled commands are hidden by default. Use -v to display them. These commands are unavailable for your current context, run "mach <command>" to see why.',
'priority': 0,
}
}
# We submit data to telemetry approximately every this many mach invocations
TELEMETRY_SUBMISSION_FREQUENCY = 10
def bootstrap(topsrcdir, mozilla_dir=None):
if mozilla_dir is None:
mozilla_dir = topsrcdir
# Ensure we are running Python 2.7+. We put this check here so we generate a
# user-friendly error message rather than a cryptic stack trace on module
# import.
if sys.version_info[0] != 2 or sys.version_info[1] < 7:
print('Python 2.7 or above (but not Python 3) is required to run mach.')
print('You are running Python', platform.python_version())
sys.exit(1)
# Global build system and mach state is stored in a central directory. By
# default, this is ~/.mozbuild. However, it can be defined via an
# environment variable. We detect first run (by lack of this directory
# existing) and notify the user that it will be created. The logic for
# creation is much simpler for the "advanced" environment variable use
# case. For default behavior, we educate users and give them an opportunity
# to react. We always exit after creating the directory because users don't
# like surprises.
sys.path[0:0] = [os.path.join(mozilla_dir, path) for path in SEARCH_PATHS]
import mach.main
from mozboot.util import get_state_dir
def telemetry_handler(context, data):
# We have not opted-in to telemetry
if 'BUILD_SYSTEM_TELEMETRY' not in os.environ:
return
telemetry_dir = os.path.join(get_state_dir()[0], 'telemetry')
try:
os.mkdir(telemetry_dir)
except OSError as e:
if e.errno != errno.EEXIST:
raise
outgoing_dir = os.path.join(telemetry_dir, 'outgoing')
try:
os.mkdir(outgoing_dir)
except OSError as e:
if e.errno != errno.EEXIST:
raise
# Add common metadata to help submit sorted data later on.
data['argv'] = sys.argv
data.setdefault('system', {}).update(dict(
architecture=list(platform.architecture()),
machine=platform.machine(),
python_version=platform.python_version(),
release=platform.release(),
system=platform.system(),
version=platform.version(),
))
if platform.system() == 'Linux':
dist = list(platform.linux_distribution())
data['system']['linux_distribution'] = dist
elif platform.system() == 'Windows':
win32_ver=list((platform.win32_ver())),
data['system']['win32_ver'] = win32_ver
elif platform.system() == 'Darwin':
# mac version is a special Cupertino snowflake
r, v, m = platform.mac_ver()
data['system']['mac_ver'] = [r, list(v), m]
with open(os.path.join(outgoing_dir, str(uuid.uuid4()) + '.json'),
'w') as f:
json.dump(data, f, sort_keys=True)
def should_skip_dispatch(context, handler):
# The user is performing a maintenance command.
if handler.name in ('bootstrap', 'doctor', 'mach-commands', 'mercurial-setup'):
return True
# We are running in automation.
if 'MOZ_AUTOMATION' in os.environ or 'TASK_ID' in os.environ:
return True
# The environment is likely a machine invocation.
if sys.stdin.closed or not sys.stdin.isatty():
return True
return False
def post_dispatch_handler(context, handler, args):
"""Perform global operations after command dispatch.
For now, we will use this to handle build system telemetry.
"""
# Don't do anything when...
if should_skip_dispatch(context, handler):
return
# We call mach environment in client.mk which would cause the
# data submission below to block the forward progress of make.
if handler.name in ('environment'):
return
# We have not opted-in to telemetry
if 'BUILD_SYSTEM_TELEMETRY' not in os.environ:
return
# Every n-th operation
if random.randint(1, TELEMETRY_SUBMISSION_FREQUENCY) != 1:
return
with open(os.devnull, 'wb') as devnull:
subprocess.Popen([sys.executable,
os.path.join(topsrcdir, 'build',
'submit_telemetry_data.py'),
get_state_dir()[0]],
stdout=devnull, stderr=devnull)
def populate_context(context, key=None):
if key is None:
return
if key == 'state_dir':
state_dir, is_environ = get_state_dir()
if is_environ:
if not os.path.exists(state_dir):
print('Creating global state directory from environment variable: %s'
% state_dir)
os.makedirs(state_dir, mode=0o770)
else:
if not os.path.exists(state_dir):
print(STATE_DIR_FIRST_RUN.format(userdir=state_dir))
try:
sys.stdin.readline()
except KeyboardInterrupt:
sys.exit(1)
print('\nCreating default state directory: %s' % state_dir)
os.makedirs(state_dir, mode=0o770)
return state_dir
if key == 'topdir':
return topsrcdir
if key == 'telemetry_handler':
return telemetry_handler
if key == 'post_dispatch_handler':
return post_dispatch_handler
raise AttributeError(key)
mach = mach.main.Mach(os.getcwd())
mach.populate_context_handler = populate_context
if not mach.settings_paths:
# default global machrc location
mach.settings_paths.append(get_state_dir()[0])
# always load local repository configuration
mach.settings_paths.append(mozilla_dir)
for category, meta in CATEGORIES.items():
mach.define_category(category, meta['short'], meta['long'],
meta['priority'])
for path in MACH_MODULES:
mach.load_commands_from_file(os.path.join(mozilla_dir, path))
return mach
# Hook import such that .pyc/.pyo files without a corresponding .py file in
# the source directory are essentially ignored. See further below for details
# and caveats.
# Objdirs outside the source directory are ignored because in most cases, if
# a .pyc/.pyo file exists there, a .py file will be next to it anyways.
class ImportHook(object):
def __init__(self, original_import):
self._original_import = original_import
# Assume the source directory is the parent directory of the one
# containing this file.
self._source_dir = os.path.normcase(os.path.abspath(
os.path.dirname(os.path.dirname(__file__)))) + os.sep
self._modules = set()
def __call__(self, name, globals=None, locals=None, fromlist=None,
level=-1):
# name might be a relative import. Instead of figuring out what that
# resolves to, which is complex, just rely on the real import.
# Since we don't know the full module name, we can't check sys.modules,
# so we need to keep track of which modules we've already seen to avoid
# to stat() them again when they are imported multiple times.
module = self._original_import(name, globals, locals, fromlist, level)
# Some tests replace modules in sys.modules with non-module instances.
if not isinstance(module, ModuleType):
return module
resolved_name = module.__name__
if resolved_name in self._modules:
return module
self._modules.add(resolved_name)
# Builtin modules don't have a __file__ attribute.
if not hasattr(module, '__file__'):
return module
# Note: module.__file__ is not always absolute.
path = os.path.normcase(os.path.abspath(module.__file__))
# Note: we could avoid normcase and abspath above for non pyc/pyo
# files, but those are actually rare, so it doesn't really matter.
if not path.endswith(('.pyc', '.pyo')):
return module
# Ignore modules outside our source directory
if not path.startswith(self._source_dir):
return module
# If there is no .py corresponding to the .pyc/.pyo module we're
# loading, remove the .pyc/.pyo file, and reload the module.
# Since we already loaded the .pyc/.pyo module, if it had side
# effects, they will have happened already, and loading the module
# with the same name, from another directory may have the same side
# effects (or different ones). We assume it's not a problem for the
# python modules under our source directory (either because it
# doesn't happen or because it doesn't matter).
if not os.path.exists(module.__file__[:-1]):
os.remove(module.__file__)
del sys.modules[module.__name__]
module = self(name, globals, locals, fromlist, level)
return module
# Install our hook
__builtin__.__import__ = ImportHook(__builtin__.__import__)