Call runpytest_subprocess explicitly for pytest 2.7.x compatibility

Author: pelme

setup.cfg

@@ -1,7 +1,7 @@
 [pytest]
 # --strict: warnings become errors.
 # -r fEsxXw: show extra test summary info for everything.
-addopts = --ignore lib/ --ignore build/ --ignore include/ --ignore local/ --ignore src/ --strict -r fEsxXw --runpytest=subprocess
+addopts = --ignore lib/ --ignore build/ --ignore include/ --ignore local/ --ignore src/ --strict -r fEsxXw
 DJANGO_SETTINGS_MODULE = pytest_django_test.settings_sqlite_file
 
 [wheel]

tests/test_database.py

@@ -193,7 +193,7 @@ def test_db_access_3(self):
                 Item.objects.count() == 1
     ''')
 
-    result = django_testdir.runpytest('-v', '--reuse-db')
+    result = django_testdir.runpytest_subprocess('-v', '--reuse-db')
     result.stdout.fnmatch_lines([
         "*test_db_access_1 ERROR*",
         "*test_db_access_2 FAILED*",

tests/test_db_setup.py

@@ -23,7 +23,7 @@ def test_db_can_be_accessed():
             assert Item.objects.count() == 0
     ''')
 
-    result = django_testdir.runpytest('-v', '--reuse-db')
+    result = django_testdir.runpytest_subprocess('-v', '--reuse-db')
     assert result.ret == 0
     result.stdout.fnmatch_lines([
         "*test_db_can_be_accessed PASSED*",
@@ -55,7 +55,7 @@ def test_db_can_be_accessed():
 
     # Do not pass in --create-db to make sure it is created when it
     # does not exist
-    result_first = django_testdir.runpytest('-v', '--reuse-db')
+    result_first = django_testdir.runpytest_subprocess('-v', '--reuse-db')
     assert result_first.ret == 0
 
     result_first.stdout.fnmatch_lines([
@@ -66,7 +66,7 @@ def test_db_can_be_accessed():
     mark_database()
     assert mark_exists()
 
-    result_second = django_testdir.runpytest('-v', '--reuse-db')
+    result_second = django_testdir.runpytest_subprocess('-v', '--reuse-db')
     assert result_second.ret == 0
     result_second.stdout.fnmatch_lines([
         "*test_db_can_be_accessed PASSED*",
@@ -75,7 +75,7 @@ def test_db_can_be_accessed():
     # Make sure the database has not been re-created
     assert mark_exists()
 
-    result_third = django_testdir.runpytest('-v', '--reuse-db', '--create-db')
+    result_third = django_testdir.runpytest_subprocess('-v', '--reuse-db', '--create-db')
     assert result_third.ret == 0
     result_third.stdout.fnmatch_lines([
         "*test_db_can_be_accessed PASSED*",
@@ -119,7 +119,7 @@ def test_a():
                     assert conn.settings_dict['NAME'] == '%s'
         ''' % (self.db_name_17, self.db_name_before_17))
 
-        result = django_testdir.runpytest('--tb=short', '-v')
+        result = django_testdir.runpytest_subprocess('--tb=short', '-v')
         assert result.ret == 0
         result.stdout.fnmatch_lines(['*test_a*PASSED*'])
 
@@ -164,7 +164,7 @@ def test_d(settings):
             _check(settings)
     ''')
 
-    result = django_testdir.runpytest('-vv', '-n2', '-s', '--reuse-db')
+    result = django_testdir.runpytest_subprocess('-vv', '-n2', '-s', '--reuse-db')
     assert result.ret == 0
     result.stdout.fnmatch_lines(['*PASSED*test_a*'])
     result.stdout.fnmatch_lines(['*PASSED*test_b*'])
@@ -174,14 +174,14 @@ def test_d(settings):
     assert db_exists('gw0')
     assert db_exists('gw1')
 
-    result = django_testdir.runpytest('-vv', '-n2', '-s', '--reuse-db')
+    result = django_testdir.runpytest_subprocess('-vv', '-n2', '-s', '--reuse-db')
     assert result.ret == 0
     result.stdout.fnmatch_lines(['*PASSED*test_a*'])
     result.stdout.fnmatch_lines(['*PASSED*test_b*'])
     result.stdout.fnmatch_lines(['*PASSED*test_c*'])
     result.stdout.fnmatch_lines(['*PASSED*test_d*'])
 
-    result = django_testdir.runpytest('-vv', '-n2', '-s', '--reuse-db',
+    result = django_testdir.runpytest_subprocess('-vv', '-n2', '-s', '--reuse-db',
                                       '--create-db')
     assert result.ret == 0
     result.stdout.fnmatch_lines(['*PASSED*test_a*'])
@@ -213,7 +213,7 @@ def test_a():
                 assert conn.creation._get_test_db_name() == ':memory:'
         ''')
 
-        result = django_testdir.runpytest('--tb=short', '-vv', '-n1')
+        result = django_testdir.runpytest_subprocess('--tb=short', '-vv', '-n1')
         assert result.ret == 0
         result.stdout.fnmatch_lines(['*PASSED*test_a*'])
 
@@ -234,7 +234,7 @@ def test_inner_south():
                 == ["mark_initial_data"]
     ''')
 
-    result = django_testdir_initial.runpytest('--tb=short', '-v')
+    result = django_testdir_initial.runpytest_subprocess('--tb=short', '-v')
     assert result.ret == 0
     result.stdout.fnmatch_lines(['*test_inner_south*PASSED*'])
 
@@ -267,7 +267,7 @@ def test_inner_south():
                     == ["mark_initial_data"]
         ''')
 
-        result = django_testdir_initial.runpytest('--tb=short', '-v', '-s')
+        result = django_testdir_initial.runpytest_subprocess('--tb=short', '-v', '-s')
         result.stdout.fnmatch_lines_random([
             "tpkg/test_the_test.py::test_inner_south*",
             "*PASSED*",
@@ -297,7 +297,7 @@ def test_inner_south():
         ''')
         django_testdir_initial.mkpydir('tpkg/app/south_migrations')
 
-        result = django_testdir_initial.runpytest('--tb=short', '-v', '-s')
+        result = django_testdir_initial.runpytest_subprocess('--tb=short', '-v', '-s')
         assert result.ret != 0
         # Can be OperationalError or DatabaseError (Django 1.4).
         result.stdout.fnmatch_lines([
@@ -324,7 +324,7 @@ def test_inner_south():
 
         testdir.create_initial_south_migration()
 
-        result = testdir.runpytest('--tb=short', '-v', '-s')
+        result = testdir.runpytest_subprocess('--tb=short', '-v', '-s')
         assert result.ret == 0
         result.stdout.fnmatch_lines(['*mark_south_migration_forwards*'])
 
@@ -346,7 +346,7 @@ def test_inner_south():
                 pass
             ''')
 
-        result = django_testdir_initial.runpytest('--tb=short', '-v', '-s')
+        result = django_testdir_initial.runpytest_subprocess('--tb=short', '-v', '-s')
         assert result.ret == 0
         result.stdout.fnmatch_lines(['*PASSED*'])
         assert 'mark_south_migration_forwards' not in result.stdout.str()
@@ -377,7 +377,7 @@ class Migration(SchemaMigration):
                 def forwards(self, orm):
                     print("mark_south_migration_forwards")
             """, 'south_migrations/0001_initial.py')
-        result = testdir.runpytest('--tb=short', '-v', '-s')
+        result = testdir.runpytest_subprocess('--tb=short', '-v', '-s')
         assert result.ret == 0
         result.stdout.fnmatch_lines(['*mark_south_migration_forwards*'])
 
@@ -404,7 +404,7 @@ def test_inner_south():
         p.write('raise Exception("This should not get imported.")',
                 ensure=True)
 
-        result = testdir.runpytest('--tb=short', '-v', '-s')
+        result = testdir.runpytest_subprocess('--tb=short', '-v', '-s')
         assert result.ret == 0
         result.stdout.fnmatch_lines_random([
             "tpkg/test_the_test.py::test_inner_south*",
@@ -440,7 +440,7 @@ def test_inner_south():
             [pytest]
             python_files=*.py""", 'pytest.ini')
 
-        result = testdir.runpytest('--tb=short', '-v', '-s', '-c', pytest_ini)
+        result = testdir.runpytest_subprocess('--tb=short', '-v', '-s', '-c', pytest_ini)
         assert result.ret == 0
         result.stdout.fnmatch_lines_random([
             "tpkg/test.py::test_inner_south*",
@@ -469,7 +469,7 @@ def test_inner_migrations():
         p.write('raise Exception("This should not get imported.")',
                 ensure=True)
 
-        result = testdir.runpytest('--nomigrations', '--tb=short', '-v')
+        result = testdir.runpytest_subprocess('--nomigrations', '--tb=short', '-v')
         assert result.ret == 0
         result.stdout.fnmatch_lines(['*test_inner_migrations*PASSED*'])
 
@@ -515,6 +515,6 @@ class Migration(migrations.Migration):
                     ),
                 ]
             """, 'migrations/0001_initial.py')
-        result = testdir.runpytest('--tb=short', '-v', '-s')
+        result = testdir.runpytest_subprocess('--tb=short', '-v', '-s')
         assert result.ret == 0
         result.stdout.fnmatch_lines(['*mark_migrations_run*'])

tests/test_django_settings_module.py

@@ -30,7 +30,7 @@ def test_ds_env(testdir, monkeypatch):
         def test_settings():
             assert os.environ['DJANGO_SETTINGS_MODULE'] == 'tpkg.settings_env'
     """)
-    result = testdir.runpytest()
+    result = testdir.runpytest_subprocess()
     result.stdout.fnmatch_lines(['*1 passed*'])
     assert result.ret == 0
 
@@ -51,7 +51,7 @@ def test_ds_ini(testdir, monkeypatch):
         def test_ds():
             assert os.environ['DJANGO_SETTINGS_MODULE'] == 'tpkg.settings_ini'
     """)
-    result = testdir.runpytest()
+    result = testdir.runpytest_subprocess()
     result.stdout.fnmatch_lines(['*1 passed*'])
     assert result.ret == 0
 
@@ -71,7 +71,7 @@ def test_ds_option(testdir, monkeypatch):
         def test_ds():
             assert os.environ['DJANGO_SETTINGS_MODULE'] == 'tpkg.settings_opt'
     """)
-    result = testdir.runpytest('--ds=tpkg.settings_opt')
+    result = testdir.runpytest_subprocess('--ds=tpkg.settings_opt')
     result.stdout.fnmatch_lines(['*1 passed*'])
     assert result.ret == 0
 
@@ -83,7 +83,7 @@ def test_ds_non_existent(testdir, monkeypatch):
     """
     monkeypatch.setenv('DJANGO_SETTINGS_MODULE', 'DOES_NOT_EXIST')
     testdir.makepyfile('def test_ds(): pass')
-    result = testdir.runpytest()
+    result = testdir.runpytest_subprocess()
     result.stderr.fnmatch_lines(["*ImportError:*DOES_NOT_EXIST*"])
     assert result.ret != 0
 
@@ -97,7 +97,7 @@ def test_ds_after_user_conftest(testdir, monkeypatch):
     testdir.makepyfile('def test_ds(): pass')
     testdir.makepyfile(settings_after_conftest="SECRET_KEY='secret'")
     # testdir.makeconftest("import sys; print(sys.path)")
-    result = testdir.runpytest('-v')
+    result = testdir.runpytest_subprocess('-v')
     result.stdout.fnmatch_lines(['*1 passed*'])
     assert result.ret == 0
 
@@ -119,7 +119,7 @@ def pytest_configure():
                 os.environ.setdefault('DJANGO_SETTINGS_MODULE',
                                       'tpkg.settings_ds')
     """)
-    r = testdir.runpytest()
+    r = testdir.runpytest_subprocess()
     assert r.ret == 0
 
 
@@ -205,7 +205,7 @@ def test_access_to_setting():
         def test_user_count():
             assert User.objects.count() == 0
     """)
-    r = testdir.runpytest()
+    r = testdir.runpytest_subprocess()
     assert r.ret == 0
 
 
@@ -219,7 +219,7 @@ def test_django_not_loaded_without_settings(testdir, monkeypatch):
         def test_settings():
             assert 'django' not in sys.modules
     """)
-    result = testdir.runpytest()
+    result = testdir.runpytest_subprocess()
     result.stdout.fnmatch_lines(['*1 passed*'])
     assert result.ret == 0
 
@@ -247,7 +247,7 @@ def test_debug_is_false():
             assert settings.DEBUG is False
     """)
 
-    r = testdir.runpytest()
+    r = testdir.runpytest_subprocess()
     assert r.ret == 0
 
 
@@ -288,7 +288,7 @@ def test_anything():
                 apps._lock.locked(), apps.ready))
         """)
 
-    result = django_testdir.runpytest('-s', '--tb=line')
+    result = django_testdir.runpytest_subprocess('-s', '--tb=line')
     result.stdout.fnmatch_lines(['*IMPORT: populating=True,ready=False*'])
     result.stdout.fnmatch_lines(['*READY(): populating=True*'])
     result.stdout.fnmatch_lines(['*TEST: populating=False,ready=True*'])
@@ -316,5 +316,5 @@ def test_env():
         def test_cfg(pytestconfig):
             assert pytestconfig.option.ds is None
     """)
-    r = testdir.runpytest('-s')
+    r = testdir.runpytest_subprocess('-s')
     assert r.ret == 0

tests/test_environment.py

@@ -65,7 +65,7 @@ def test_for_invalid_template(client):
         def test_ignore(client):
             client.get('/invalid_template/')
         ''')
-    result = django_testdir.runpytest('-s', '--fail-on-template-vars')
+    result = django_testdir.runpytest_subprocess('-s', '--fail-on-template-vars')
     result.stdout.fnmatch_lines_random([
         "tpkg/test_the_test.py F.",
         "Undefined template variable 'invalid_var' in 'invalid_template.html'",
@@ -109,7 +109,7 @@ def test_for_invalid_template(client):
         def test_ignore(client):
             client.get('/invalid_template/')
         ''')
-    result = django_testdir.runpytest('-s')
+    result = django_testdir.runpytest_subprocess('-s')
     result.stdout.fnmatch_lines_random([
         "tpkg/test_the_test.py ..",
     ])
@@ -155,35 +155,35 @@ def test_inner_testrunner():
 
     def test_default(self, testdir):
         """Not verbose by default."""
-        result = testdir.runpytest('-s')
+        result = testdir.runpytest_subprocess('-s')
         result.stdout.fnmatch_lines([
             "tpkg/test_the_test.py ."])
 
     def test_vq_verbosity_0(self, testdir):
         """-v and -q results in verbosity 0."""
-        result = testdir.runpytest('-s', '-v', '-q')
+        result = testdir.runpytest_subprocess('-s', '-v', '-q')
         result.stdout.fnmatch_lines([
             "tpkg/test_the_test.py ."])
 
     def test_verbose_with_v(self, testdir):
         """Verbose output with '-v'."""
-        result = testdir.runpytest('-s', '-v')
+        result = testdir.runpytest_subprocess('-s', '-v')
         result.stdout.fnmatch_lines_random([
             "tpkg/test_the_test.py:*",
             "*PASSED*",
             "*Destroying test database for alias 'default'...*"])
 
     def test_more_verbose_with_vv(self, testdir):
         """More verbose output with '-v -v'."""
-        result = testdir.runpytest('-s', '-v', '-v')
+        result = testdir.runpytest_subprocess('-s', '-v', '-v')
         result.stdout.fnmatch_lines([
             "tpkg/test_the_test.py:*Creating test database for alias*",
             "*Creating table app_item*",
             "*PASSED*Destroying test database for alias 'default' ('*')...*"])
 
     def test_more_verbose_with_vv_and_reusedb(self, testdir):
         """More verbose output with '-v -v', and --reuse-db."""
-        result = testdir.runpytest('-s', '-v', '-v', '--reuse-db')
+        result = testdir.runpytest_subprocess('-s', '-v', '-v', '--reuse-db')
         result.stdout.fnmatch_lines([
             "tpkg/test_the_test.py:*Creating test database for alias*",
             "*PASSED*"])

tests/test_fixtures.py

@@ -182,7 +182,7 @@ def test_a(self, live_server, settings):
                         live_server + '/static/a_file.txt').read()
                     assert force_text(response_data) == 'bla\\n'
             """)
-        result = django_testdir.runpytest('--tb=short', '-v')
+        result = django_testdir.runpytest_subprocess('--tb=short', '-v')
         result.stdout.fnmatch_lines(['*test_a*PASSED*'])
         assert result.ret == 0
 
@@ -296,6 +296,6 @@ class Migration(migrations.Migration):
     ]
     """, 'migrations/0001_initial.py')  # noqa
 
-    result = django_testdir.runpytest('-s')
+    result = django_testdir.runpytest_subprocess('-s')
     result.stdout.fnmatch_lines(['*1 passed*'])
     assert result.ret == 0