Split up reset sequence test to avoid transaction issue on newly created db

Author: Oliver Sauder

tests/test_database.py

@@ -83,7 +83,7 @@ def test_transactions_enabled_via_reset_seq(
 
         assert not connection.in_atomic_block
 
-    def test_django_db_reset_sequences_fixture(
+    def test_django_db_reset_sequences_fixture_requested(
             self, db, django_testdir, non_zero_sequences_counter):
 
         if not db_supports_reset_sequences():
@@ -96,10 +96,6 @@ def test_django_db_reset_sequences_fixture(
             import pytest
             from .app.models import Item
 
-            def test_django_db_reset_sequences_not_requested(db):
-                item = Item.objects.create(name='new_item')
-                assert item.id > 1
-
             def test_django_db_reset_sequences_requested(
                     django_db_reset_sequences):
                 item = Item.objects.create(name='new_item')
@@ -108,10 +104,32 @@ def test_django_db_reset_sequences_requested(
 
         result = django_testdir.runpytest_subprocess('-v', '--reuse-db')
         result.stdout.fnmatch_lines([
-            "*test_django_db_reset_sequences_not_requested PASSED*",
             "*test_django_db_reset_sequences_requested PASSED*",
         ])
 
+    def test_django_db_reset_sequences_fixture_not_requested(
+            self, db, django_testdir, non_zero_sequences_counter):
+
+        if not db_supports_reset_sequences():
+            pytest.skip('transactions and reset_sequences must be supported '
+                        'by the database to run this test')
+
+        # The test runs on a database that already contains objects, so its
+        # id counter is > 1. We check for the ids of newly created objects.
+        django_testdir.create_test_module('''
+            import pytest
+            from .app.models import Item
+
+            def test_django_db_reset_sequences_not_requested(db):
+                item = Item.objects.create(name='new_item')
+                assert item.id > 1
+        ''')
+
+        result = django_testdir.runpytest_subprocess('-v', '--reuse-db')
+        result.stdout.fnmatch_lines([
+            "*test_django_db_reset_sequences_not_requested PASSED*",
+        ])
+
     @pytest.fixture
     def mydb(self, all_dbs):
         # This fixture must be able to access the database