Fix tests for pytest 3.3 (pytest-dev#552)

Fixes pytest-dev#550.

Author: blueyed

tests/test_environment.py

@@ -96,7 +96,7 @@ def test_ignore(client):
     else:
         origin = "'invalid_template.html'"
     result.stdout.fnmatch_lines_random([
-        "tpkg/test_the_test.py F.",
+        "tpkg/test_the_test.py F.*",
         "E * Failed: Undefined template variable 'invalid_var' in {}".format(origin)
     ])
 
@@ -143,7 +143,7 @@ def test_ignore(client):
         ''')
     result = django_testdir.runpytest_subprocess('-s')
     result.stdout.fnmatch_lines_random([
-        "tpkg/test_the_test.py ..",
+        "tpkg/test_the_test.py ..*",
     ])
 
 
@@ -190,13 +190,13 @@ def test_default(self, testdir):
         """Not verbose by default."""
         result = testdir.runpytest_subprocess('-s')
         result.stdout.fnmatch_lines([
-            "tpkg/test_the_test.py ."])
+            "tpkg/test_the_test.py .*"])
 
     def test_vq_verbosity_0(self, testdir):
         """-v and -q results in verbosity 0."""
         result = testdir.runpytest_subprocess('-s', '-v', '-q')
         result.stdout.fnmatch_lines([
-            "tpkg/test_the_test.py ."])
+            "tpkg/test_the_test.py .*"])
 
     def test_verbose_with_v(self, testdir):
         """Verbose output with '-v'."""

tests/test_unittest.py

@@ -117,7 +117,7 @@ def test_pass(self):
             "CALLED: setUpClass",
             "CALLED: setUp",
             "CALLED: tearDown",
-            "PASSED",
+            "PASSED*",
             "CALLED: tearDownClass",
         ])
         assert result.ret == 0
@@ -215,7 +215,7 @@ def test_pass(self):
             "CALLED: setUpClass",
             "CALLED: setUp",
             "CALLED: tearDown",
-            "PASSED",
+            "PASSED*",
             "CALLED: tearDownClass",
         ])
         assert result.ret == 0

tox.ini

@@ -9,7 +9,7 @@ envlist =
 
 [testenv]
 deps =
-    pytest>=3.0,<4.0
+    pytest>=3.0,<3.4
     django-configurations==2.0
     pytest-xdist==1.15
     {env:_PYTESTDJANGO_TOX_EXTRA_DEPS:}