Commit 924ae1a0 authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.2.X] Pass commit=False to loaddata in tests, which will keep the DB... 

[1.2.X] Pass commit=False to loaddata in tests, which will keep the DB connection open. Closing the connection has the side-effect on some DBs (Postgres, MySQL/InnoDB) of rolling back the transaction that was in progress, causing these tests to fail. 

r13717 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent ec8d04cf

tests/modeltests/fixtures_model_package/tests.py

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class FixtureTestCase(TestCase): 
    def test_loaddata(self):

        "Fixtures can load data into models defined in packages"

        # Load fixture 1. Single JSON file, with two objects

        management.call_command("loaddata", "fixture1.json", verbosity=0)

        management.call_command("loaddata", "fixture1.json", verbosity=0, commit=False)

        self.assertQuerysetEqual(

            Article.objects.all(), [

                "Time to reform copyright",
@@ -47,7 +47,7 @@ class FixtureTestCase(TestCase): 


        # Load fixture 2. JSON file imported by default. Overwrites some

        # existing objects

        management.call_command("loaddata", "fixture2.json", verbosity=0)

        management.call_command("loaddata", "fixture2.json", verbosity=0, commit=False)

        self.assertQuerysetEqual(

            Article.objects.all(), [

                "Django conquers world!",
@@ -59,7 +59,7 @@ class FixtureTestCase(TestCase): 
        )



        # Load a fixture that doesn't exist

        management.call_command("loaddata", "unknown.json", verbosity=0)

        management.call_command("loaddata", "unknown.json", verbosity=0, commit=False)

        self.assertQuerysetEqual(

            Article.objects.all(), [

                "Django conquers world!",