Merge branch 'tests-check-more-ret'

Closes: pytest-dev#205

Author: blueyed

pytest_django/fixtures.py

@@ -107,7 +107,7 @@ def _handle_south():
         # if `south` >= 0.7.1 we can use the test helper
         from south.management.commands import patch_for_test_db_setup
     except ImportError:
-        # if `south` < 0.7.1 make sure it's migrations are disabled
+        # if `south` < 0.7.1 make sure its migrations are disabled
         management.get_commands()
         management._commands['syncdb'] = 'django.core'
     else:

tests/test_db_setup.py

@@ -24,6 +24,7 @@ def test_db_can_be_accessed():
     ''')
 
     result = django_testdir.runpytest('-v', '--reuse-db')
+    assert result.ret == 0
     result.stdout.fnmatch_lines([
         "*test_db_can_be_accessed PASSED*",
     ])
@@ -55,6 +56,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')
+    assert result_first.ret == 0
 
     result_first.stdout.fnmatch_lines([
         "*test_db_can_be_accessed PASSED*",
@@ -65,6 +67,7 @@ def test_db_can_be_accessed():
     assert mark_exists()
 
     result_second = django_testdir.runpytest('-v', '--reuse-db')
+    assert result_second.ret == 0
     result_second.stdout.fnmatch_lines([
         "*test_db_can_be_accessed PASSED*",
     ])
@@ -73,6 +76,7 @@ def test_db_can_be_accessed():
     assert mark_exists()
 
     result_third = django_testdir.runpytest('-v', '--reuse-db', '--create-db')
+    assert result_third.ret == 0
     result_third.stdout.fnmatch_lines([
         "*test_db_can_be_accessed PASSED*",
     ])
@@ -116,6 +120,7 @@ def test_a():
         ''' % (self.db_name_17, self.db_name_before_17))
 
         result = django_testdir.runpytest('--tb=short', '-v')
+        assert result.ret == 0
         result.stdout.fnmatch_lines(['*test_a*PASSED*'])
 
 
@@ -160,6 +165,7 @@ def test_d(settings):
     ''')
 
     result = django_testdir.runpytest('-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*'])
@@ -169,13 +175,15 @@ def test_d(settings):
     assert db_exists('gw1')
 
     result = django_testdir.runpytest('-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',
                                       '--create-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*'])
@@ -206,6 +214,7 @@ def test_a():
         ''')
 
         result = django_testdir.runpytest('--tb=short', '-vv', '-n1')
+        assert result.ret == 0
         result.stdout.fnmatch_lines(['*PASSED*test_a*'])
 
 
@@ -226,6 +235,7 @@ def test_inner_south():
     ''')
 
     result = django_testdir_initial.runpytest('--tb=short', '-v')
+    assert result.ret == 0
     result.stdout.fnmatch_lines(['*test_inner_south*PASSED*'])
 
 
@@ -236,7 +246,7 @@ def test_inner_south():
 @pytest.mark.skipif(sys.version_info[0] == 3,
                     reason='South is not properly supported on Python 3')
 class TestSouth:
-    """Test interaction with initial_data and South."""
+    """Test interaction with South, with and without initial_data."""
 
     @pytest.mark.django_project(extra_settings="""
         INSTALLED_APPS += [ 'south', ]
@@ -288,6 +298,7 @@ def test_inner_south():
         django_testdir_initial.mkpydir('tpkg/app/south_migrations')
 
         result = django_testdir_initial.runpytest('--tb=short', '-v', '-s')
+        assert result.ret != 0
         # Can be OperationalError or DatabaseError (Django 1.4).
         result.stdout.fnmatch_lines([
             '*Error:* no such table: app_item*'])
@@ -300,9 +311,8 @@ def test_inner_south():
         }
         """)
     def test_initial_south_migrations(self, django_testdir_initial):
-        """
-        Test initial data with existing South migrations.
-        """
+        """This should fail, because it has no real migration that
+        would create the table, and so no initial data can be loaded."""
         testdir = django_testdir_initial
         testdir.create_test_module('''
             import pytest
@@ -315,11 +325,39 @@ def test_inner_south():
         testdir.create_initial_south_migration()
 
         result = testdir.runpytest('--tb=short', '-v', '-s')
-        result.stdout.fnmatch_lines_random([
-            "tpkg/test_the_test.py::test_inner_south*",
-            "*mark_south_migration_forwards*",
-            "*PASSED*",
-            "*Destroying test database for alias 'default'...*"])
+        assert result.ret != 0
+        result.stderr.fnmatch_lines(['*no such table: app_item*'])
+        result.stdout.fnmatch_lines(['*mark_south_migration_forwards*'])
+
+    @pytest.mark.django_project(extra_settings="""
+        INSTALLED_APPS += [ 'south', ]
+        SOUTH_TESTS_MIGRATE = True
+        SOUTH_MIGRATION_MODULES = {
+            'app': 'tpkg.app.south_migrations',
+        }
+        """)
+    def test_south_migrations(self, django_testdir):
+        """South migration with a normal testdir (no initial data)."""
+        testdir = django_testdir
+        testdir.create_test_module('''
+            import pytest
+
+            @pytest.mark.django_db
+            def test_inner_south():
+                pass
+            ''')
+
+        testdir.mkpydir('tpkg/app/south_migrations')
+        testdir.create_app_file("""
+            from south.v2 import SchemaMigration
+
+            class Migration(SchemaMigration):
+                def forwards(self, orm):
+                    print("mark_south_migration_forwards")
+            """, 'south_migrations/0001_initial.py')
+        result = testdir.runpytest('--tb=short', '-v', '-s')
+        assert result.ret == 0
+        result.stdout.fnmatch_lines(['*mark_south_migration_forwards*'])
 
     @pytest.mark.django_project(extra_settings="""
         INSTALLED_APPS += [ 'south', ]
@@ -345,6 +383,7 @@ def test_inner_south():
                 ensure=True)
 
         result = testdir.runpytest('--tb=short', '-v', '-s')
+        assert result.ret == 0
         result.stdout.fnmatch_lines_random([
             "tpkg/test_the_test.py::test_inner_south*",
             "*PASSED*",
@@ -380,6 +419,7 @@ def test_inner_south():
             python_files=*.py""", 'pytest.ini')
 
         result = testdir.runpytest('--tb=short', '-v', '-s', '-c', pytest_ini)
+        assert result.ret == 0
         result.stdout.fnmatch_lines_random([
             "tpkg/test.py::test_inner_south*",
             "*mark_south_migration_forwards*",
@@ -408,6 +448,7 @@ def test_inner_migrations():
                 ensure=True)
 
         result = testdir.runpytest('--nomigrations', '--tb=short', '-v')
+        assert result.ret == 0
         result.stdout.fnmatch_lines(['*test_inner_migrations*PASSED*'])
 
     @pytest.mark.skipif(get_django_version() < (1, 7),
@@ -453,4 +494,5 @@ class Migration(migrations.Migration):
                 ]
             """, 'migrations/0001_initial.py')
         result = testdir.runpytest('--tb=short', '-v', '-s')
+        assert result.ret == 0
         result.stdout.fnmatch_lines(['*mark_migrations_run*'])

tests/test_django_configurations.py

@@ -46,6 +46,7 @@ def test_settings():
     """)
     result = testdir.runpytest()
     result.stdout.fnmatch_lines(['*1 passed*'])
+    assert result.ret == 0
 
 
 def test_dc_ini(testdir, monkeypatch):
@@ -69,6 +70,7 @@ def test_ds():
     """)
     result = testdir.runpytest()
     result.stdout.fnmatch_lines(['*1 passed*'])
+    assert result.ret == 0
 
 
 def test_dc_option(testdir, monkeypatch):
@@ -92,3 +94,4 @@ def test_ds():
     """)
     result = testdir.runpytest('--ds=tpkg.settings_opt', '--dc=MySettings')
     result.stdout.fnmatch_lines(['*1 passed*'])
+    assert result.ret == 0

tests/test_django_settings_module.py

@@ -32,6 +32,7 @@ def test_settings():
     """)
     result = testdir.runpytest()
     result.stdout.fnmatch_lines(['*1 passed*'])
+    assert result.ret == 0
 
 
 def test_ds_ini(testdir, monkeypatch):
@@ -51,6 +52,7 @@ def test_ds():
     """)
     result = testdir.runpytest()
     result.stdout.fnmatch_lines(['*1 passed*'])
+    assert result.ret == 0
 
 
 def test_ds_option(testdir, monkeypatch):
@@ -70,6 +72,7 @@ def test_ds():
     """)
     result = testdir.runpytest('--ds=tpkg.settings_opt')
     result.stdout.fnmatch_lines(['*1 passed*'])
+    assert result.ret == 0
 
 
 def test_ds_non_existent(testdir, monkeypatch):
@@ -81,6 +84,7 @@ def test_ds_non_existent(testdir, monkeypatch):
     testdir.makepyfile('def test_ds(): pass')
     result = testdir.runpytest()
     result.stderr.fnmatch_lines(["*ImportError:*DOES_NOT_EXIST*"])
+    assert result.ret != 0
 
 
 def test_ds_after_user_conftest(testdir, monkeypatch):
@@ -94,6 +98,7 @@ def test_ds_after_user_conftest(testdir, monkeypatch):
     # testdir.makeconftest("import sys; print(sys.path)")
     result = testdir.runpytest('-v')
     result.stdout.fnmatch_lines(['*1 passed*'])
+    assert result.ret == 0
 
 
 def test_ds_in_pytest_configure(testdir, monkeypatch):
@@ -211,6 +216,7 @@ def test_settings():
     """)
     result = testdir.runpytest()
     result.stdout.fnmatch_lines(['*1 passed*'])
+    assert result.ret == 0
 
 
 def test_debug_false(testdir, monkeypatch):
@@ -282,6 +288,7 @@ def test_anything():
     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*'])
+    assert result.ret == 0
 
 
 def test_no_ds_but_django_imported(testdir, monkeypatch):

tests/test_fixtures.py

@@ -189,6 +189,7 @@ def test_a(self, live_server, settings):
             """)
         result = django_testdir.runpytest('--tb=short', '-v')
         result.stdout.fnmatch_lines(['*test_a*PASSED*'])
+        assert result.ret == 0
 
     @pytest.mark.skipif(get_django_version() < (1, 7),
                         reason="Django >= 1.7 required")
@@ -305,3 +306,4 @@ class Migration(migrations.Migration):
 
     result = django_testdir.runpytest('-s')
     result.stdout.fnmatch_lines(['*1 passed*'])
+    assert result.ret == 0

tests/test_manage_py_scan.py

@@ -29,6 +29,8 @@ def test_django_project_found_invalid_settings(django_testdir, monkeypatch):
     monkeypatch.setenv('DJANGO_SETTINGS_MODULE', 'DOES_NOT_EXIST')
 
     result = django_testdir.runpytest('django_project_root')
+    assert result.ret != 0
+
     result.stderr.fnmatch_lines(['*ImportError:*DOES_NOT_EXIST*'])
     result.stderr.fnmatch_lines(['*pytest-django found a Django project*'])
 
@@ -43,6 +45,7 @@ def test_django_project_scan_disabled_invalid_settings(django_testdir,
     ''')
 
     result = django_testdir.runpytest('django_project_root')
+    assert result.ret != 0
 
     result.stderr.fnmatch_lines(['*ImportError*DOES_NOT_EXIST*'])
     result.stderr.fnmatch_lines(['*pytest-django did not search for '