Merge master into features

2019-04-14 23:22:21 +02:00
parent 19035f4b55 533e610a35
commit 6f0a5789fb
23 changed files with 359 additions and 161 deletions
--- a/testing/python/fixtures.py
+++ b/testing/python/fixtures.py
@@ -1071,9 +1071,7 @@ class TestFixtureUsages(object):
        )
        result = testdir.runpytest_inprocess()
        result.stdout.fnmatch_lines(
-            (
-                "*Fixture 'badscope' from test_invalid_scope.py got an unexpected scope value 'functions'"
-            )
+            "*Fixture 'badscope' from test_invalid_scope.py got an unexpected scope value 'functions'"
        )

    def test_funcarg_parametrized_and_used_twice(self, testdir):