Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to fix ci_resources_unittest (#10114) #10116

Merged
merged 1 commit into from Mar 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions resources/test/tox.ini
@@ -1,4 +1,6 @@
[tox]
# wptserve etc. are Python2-only.
envlist = py27
skipsdist=True

[testenv]
Expand All @@ -9,5 +11,6 @@ deps =
pytest>=2.9
pyvirtualdisplay
selenium
requests

commands = pytest {posargs} -vv tests
3 changes: 1 addition & 2 deletions tools/ci/ci_resources_unittest.sh
Expand Up @@ -8,13 +8,12 @@ cd $WPT_ROOT
main() {
cd $WPT_ROOT
pip install -U tox
pip install --requirement tools/wpt/requirements.txt
./wpt install firefox browser --destination $HOME
./wpt install firefox webdriver --destination $HOME/firefox
export PATH=$HOME/firefox:$PATH

cd $WPT_ROOT/resources/test
tox
tox -- --binary=$HOME/browsers/firefox/firefox
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The line above installs in $HOME/firefox - where does the browsers/ subdir come from?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is installed in one more line above.

wpt install firefox browser installs the browser to DESTINATION/browsers/firefox

}

main