From 332ca071ccc336f25790a78216c0022b4352c920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 20 May 2018 13:56:26 +0200 Subject: [PATCH] Use pytest instead of py.test per upstream recommendation, #dropthedot http://blog.pytest.org/2016/whats-new-in-pytest-30/ https://twitter.com/hashtag/dropthedot --- test/run_travis.sh | 2 +- test/selenium/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/run_travis.sh b/test/run_travis.sh index 5f01cca66a56..5be85386eea8 100755 --- a/test/run_travis.sh +++ b/test/run_travis.sh @@ -26,7 +26,7 @@ function run_unittests { } function run_selenium { - ENABLE_XVFB=1 py.test -v --capture=no ${testdir} # autodiscover and run the tests + ENABLE_XVFB=1 pytest -v --capture=no ${testdir} # autodiscover and run the tests } if [ "$TEST" == "lint" ]; then diff --git a/test/selenium/requirements.txt b/test/selenium/requirements.txt index 8f3610e8519b..518a89e7698a 100644 --- a/test/selenium/requirements.txt +++ b/test/selenium/requirements.txt @@ -1,4 +1,4 @@ selenium -xvfbwrapper -pytest +xvfbwrapper +pytest>=3 lxml