WebDriver: auto-install pytest instead of importing it from wpt tools directory
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 2 Dec 2017 14:56:26 +0000 (14:56 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 2 Dec 2017 14:56:26 +0000 (14:56 +0000)
commit89aeaef797fd994b0d3e3cd071f06d20546680fc
treea3eb16ff341aeb6a6c18d5a6220e26ca37626842
parent5843f78a1fabe21408b987a6c57986ba693866ea
WebDriver: auto-install pytest instead of importing it from wpt tools directory
https://bugs.webkit.org/show_bug.cgi?id=180243

Reviewed by Brian Burg.

Tools:

We don't really need the (old) version included in wpt tools dir, so we can simply remove it and use autoinstall
instead.

* Scripts/webkitpy/thirdparty/__init__.py:
(AutoinstallImportHook.find_module): Check pytest.
(AutoinstallImportHook._install_pytest): Install pytest.
* Scripts/webkitpy/webdriver_tests/webdriver_selenium_executor.py: Import autoinstalled pytest.
* Scripts/webkitpy/webdriver_tests/webdriver_test_runner_w3c.py:
(WebDriverTestRunnerW3C.run): Update the subtest path since the new pytest uses a different strategy for
rootdir.
* Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py: Import autoinstalled pytest.

WebDriverTests:

* imported/selenium/py/conftest.py: Stop patching this to use yield_fixture, new pytest supports this.
* imported/selenium/py/setup.cfg: Stop patching this, since pytest supports tool:pytest as group name.
* imported/selenium/py/test/selenium/webdriver/common/alerts_tests.py: Stop patching this to use yield_fixture,
new pytest supports this.
* imported/selenium/py/test/selenium/webdriver/common/cookie_tests.py: Ditto.
* imported/selenium/py/test/selenium/webdriver/common/frame_switching_tests.py: Ditto.
* imported/selenium/py/test/selenium/webdriver/common/page_load_timeout_tests.py: Ditto.
* imported/selenium/py/test/selenium/webdriver/common/window_switching_tests.py: Ditto.
* imported/selenium/py/test/selenium/webdriver/safari/conftest.py: Ditto.
* imported/selenium/py/test/selenium/webdriver/support/event_firing_webdriver_tests.py: Ditto.
* imported/w3c/importer.json: Stop importing pytest.
* imported/w3c/pytest.ini: Added.
* imported/w3c/tools/pytest/: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@225447 268f45cc-cd09-0410-ab3c-d52691b4dbfc
92 files changed:
Tools/ChangeLog
Tools/Scripts/webkitpy/thirdparty/__init__.py
Tools/Scripts/webkitpy/webdriver_tests/webdriver_selenium_executor.py
Tools/Scripts/webkitpy/webdriver_tests/webdriver_test_runner_w3c.py
Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py
WebDriverTests/ChangeLog
WebDriverTests/imported/selenium/py/conftest.py
WebDriverTests/imported/selenium/py/setup.cfg
WebDriverTests/imported/selenium/py/test/selenium/webdriver/common/alerts_tests.py
WebDriverTests/imported/selenium/py/test/selenium/webdriver/common/cookie_tests.py
WebDriverTests/imported/selenium/py/test/selenium/webdriver/common/frame_switching_tests.py
WebDriverTests/imported/selenium/py/test/selenium/webdriver/common/page_load_timeout_tests.py
WebDriverTests/imported/selenium/py/test/selenium/webdriver/common/window_switching_tests.py
WebDriverTests/imported/selenium/py/test/selenium/webdriver/safari/conftest.py
WebDriverTests/imported/selenium/py/test/selenium/webdriver/support/event_firing_webdriver_tests.py
WebDriverTests/imported/w3c/importer.json
WebDriverTests/imported/w3c/pytest.ini [new file with mode: 0644]
WebDriverTests/imported/w3c/tools/pytest/.coveragerc [deleted file]
WebDriverTests/imported/w3c/tools/pytest/.gitattributes [deleted file]
WebDriverTests/imported/w3c/tools/pytest/.github/ISSUE_TEMPLATE.md [deleted file]
WebDriverTests/imported/w3c/tools/pytest/.github/PULL_REQUEST_TEMPLATE.md [deleted file]
WebDriverTests/imported/w3c/tools/pytest/.gitignore [deleted file]
WebDriverTests/imported/w3c/tools/pytest/.travis.yml [deleted file]
WebDriverTests/imported/w3c/tools/pytest/AUTHORS [deleted file]
WebDriverTests/imported/w3c/tools/pytest/CHANGELOG.rst [deleted file]
WebDriverTests/imported/w3c/tools/pytest/CONTRIBUTING.rst [deleted file]
WebDriverTests/imported/w3c/tools/pytest/HOWTORELEASE.rst [deleted file]
WebDriverTests/imported/w3c/tools/pytest/ISSUES.txt [deleted file]
WebDriverTests/imported/w3c/tools/pytest/LICENSE [deleted file]
WebDriverTests/imported/w3c/tools/pytest/MANIFEST.in [deleted file]
WebDriverTests/imported/w3c/tools/pytest/README.rst [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/__init__.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/_argcomplete.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/_code/__init__.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/_code/_py2traceback.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/_code/code.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/_code/source.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/_pluggy.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/assertion/__init__.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/assertion/reinterpret.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/assertion/rewrite.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/assertion/util.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/cacheprovider.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/capture.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/config.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/doctest.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/genscript.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/helpconfig.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/hookspec.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/impl [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/junitxml.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/main.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/mark.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/monkeypatch.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/nose.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/pastebin.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/pdb.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/pytester.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/python.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/recwarn.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/resultlog.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/runner.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/skipping.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/standalonetemplate.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/terminal.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/tmpdir.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/unittest.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/vendored_packages/README.md [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/vendored_packages/__init__.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/vendored_packages/pluggy-0.3.1.dist-info/DESCRIPTION.rst [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/vendored_packages/pluggy-0.3.1.dist-info/METADATA [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/vendored_packages/pluggy-0.3.1.dist-info/RECORD [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/vendored_packages/pluggy-0.3.1.dist-info/WHEEL [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/vendored_packages/pluggy-0.3.1.dist-info/metadata.json [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/vendored_packages/pluggy-0.3.1.dist-info/pbr.json [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/vendored_packages/pluggy-0.3.1.dist-info/top_level.txt [deleted file]
WebDriverTests/imported/w3c/tools/pytest/_pytest/vendored_packages/pluggy.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/appveyor.yml [deleted file]
WebDriverTests/imported/w3c/tools/pytest/bench/bench.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/bench/bench_argcomplete.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/bench/empty.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/bench/manyparam.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/bench/skip.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/extra/get_issues.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/extra/setup-py.test/setup.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/plugin-test.sh [deleted file]
WebDriverTests/imported/w3c/tools/pytest/pytest.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/requirements-docs.txt [deleted file]
WebDriverTests/imported/w3c/tools/pytest/runtox.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/setup.cfg [deleted file]
WebDriverTests/imported/w3c/tools/pytest/setup.py [deleted file]
WebDriverTests/imported/w3c/tools/pytest/tox.ini [deleted file]