summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPaul McMillan <Paul@McMillan.ws>2010-07-02 19:14:58 +0000
committerPaul McMillan <Paul@McMillan.ws>2010-07-02 19:14:58 +0000
commit90fab13583224a69490b5ef67b086d7ef4d2bb14 (patch)
tree0f42d7a94cb13cccb05de3c6d847f5a9ceba9aad /tests
parentcee4afc267e169d9a92d65287f46deebcae98306 (diff)
[soc2010/test-refactor] Can't use class decorators in python 2.4.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
-rw-r--r--tests/modeltests/fixtures/tests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/modeltests/fixtures/tests.py b/tests/modeltests/fixtures/tests.py
index 8696ec2fb6..38d59f5a1c 100644
--- a/tests/modeltests/fixtures/tests.py
+++ b/tests/modeltests/fixtures/tests.py
@@ -230,7 +230,6 @@ class FixtureLoadingTests(TestCase):
self._dumpdata_assert(['fixtures'], """<?xml version="1.0" encoding="utf-8"?>
<django-objects version="1.0"><object pk="1" model="fixtures.category"><field type="CharField" name="title">News Stories</field><field type="TextField" name="description">Latest news stories</field></object><object pk="3" model="fixtures.article"><field type="CharField" name="headline">Time to reform copyright</field><field type="DateTimeField" name="pub_date">2006-06-16 13:00:00</field></object><object pk="2" model="fixtures.article"><field type="CharField" name="headline">Poker has no place on ESPN</field><field type="DateTimeField" name="pub_date">2006-06-16 12:00:00</field></object><object pk="1" model="fixtures.article"><field type="CharField" name="headline">Python program becomes self aware</field><field type="DateTimeField" name="pub_date">2006-06-16 11:00:00</field></object><object pk="1" model="fixtures.tag"><field type="CharField" name="name">copyright</field><field to="contenttypes.contenttype" name="tagged_type" rel="ManyToOneRel"><natural>fixtures</natural><natural>article</natural></field><field type="PositiveIntegerField" name="tagged_id">3</field></object><object pk="2" model="fixtures.tag"><field type="CharField" name="name">law</field><field to="contenttypes.contenttype" name="tagged_type" rel="ManyToOneRel"><natural>fixtures</natural><natural>article</natural></field><field type="PositiveIntegerField" name="tagged_id">3</field></object><object pk="1" model="fixtures.person"><field type="CharField" name="name">Django Reinhardt</field></object><object pk="3" model="fixtures.person"><field type="CharField" name="name">Prince</field></object><object pk="2" model="fixtures.person"><field type="CharField" name="name">Stephane Grappelli</field></object></django-objects>""", format='xml', natural_keys=True)
-@skipIfDBEngine('django.db.backends.mysql')
class FixtureTransactionTests(TransactionTestCase):
def _dumpdata_assert(self, args, output, format='json'):
new_io = StringIO.StringIO()
@@ -238,6 +237,7 @@ class FixtureTransactionTests(TransactionTestCase):
command_output = new_io.getvalue().strip()
self.assertEqual(command_output, output)
+ @skipIfDBEngine('django.db.backends.mysql')
def test_format_discovery(self):
# Load fixture 1 again, using format discovery
management.call_command('loaddata', 'fixture1', verbosity=0, commit=False)