Use pytest instead of py.test per upstream recommendation, #dropthedot (EFForg#15486)

scop · Hainish · commit 929e9a834a7d · 2018-08-20T15:25:22.000-07:00
http://blog.pytest.org/2016/whats-new-in-pytest-30/ https://twitter.com/hashtag/dropthedot
diff --git 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
@@ -1,4 +1,4 @@
 selenium
-xvfbwrapper 
-pytest
+xvfbwrapper
+pytest>=3
 lxml

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ function run_unittests {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`function run_selenium {`
`29`		`- ENABLE_XVFB=1 py.test -v --capture=no ${testdir} # autodiscover and run the tests`
	`29`	`+ ENABLE_XVFB=1 pytest -v --capture=no ${testdir} # autodiscover and run the tests`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`if [ "$TEST" == "lint" ]; then`