Bug 1447496 [wpt PR 10116] - Attempt to fix ci_resources_unittest (#10114), a=testonly
authorRobert Ma <bob1211@gmail.com>
Mon, 09 Apr 2018 17:29:44 +0000
changeset 413547 654918a6a5cdd917d6018b42980c318995609813
parent 413546 7aa5cbfd0daa25162b40ca204419fa9fe82049a6
child 413548 939bbbe074776987ae799ff3893c02b7ba5ab634
push id102161
push userjames@hoppipolla.co.uk
push dateSun, 15 Apr 2018 09:10:16 +0000
treeherdermozilla-inbound@ebfad4be630d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1447496, 10116, 10114
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1447496 [wpt PR 10116] - Attempt to fix ci_resources_unittest (#10114), a=testonly Automatic update from web-platform-testsAttempt to fix ci_resources_unittest (#10116) The test wasn't running against the downloaded Firefox Nightly but system Firefox instead, which is fixed by passing the binary path to tox (which then passes it to pytest conftest.py). The pip requirements should be managed by tox. wpt-commits: 47c9322f474fe123c6df2223bd93b8fd0056c6f9 wpt-pr: 10116 wpt-commits: 47c9322f474fe123c6df2223bd93b8fd0056c6f9 wpt-pr: 10116
testing/web-platform/tests/resources/test/tox.ini
testing/web-platform/tests/tools/ci/ci_resources_unittest.sh
--- a/testing/web-platform/tests/resources/test/tox.ini
+++ b/testing/web-platform/tests/resources/test/tox.ini
@@ -1,13 +1,16 @@
 [tox]
+# wptserve etc. are Python2-only.
+envlist = py27
 skipsdist=True
 
 [testenv]
 passenv=DISPLAY # Necessary for the spawned GeckoDriver process to connect to
                 # the appropriate display.
 deps =
   html5lib
   pytest>=2.9
   pyvirtualdisplay
   selenium
+  requests
 
 commands = pytest {posargs} -vv tests
--- a/testing/web-platform/tests/tools/ci/ci_resources_unittest.sh
+++ b/testing/web-platform/tests/tools/ci/ci_resources_unittest.sh
@@ -3,18 +3,17 @@ set -ex
 
 SCRIPT_DIR=$(dirname $(readlink -f "$0"))
 WPT_ROOT=$(readlink -f $SCRIPT_DIR/../..)
 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
 }
 
 main