Skip to content

Commit 71a7627

Browse files
committed
Do not register new models inside a transaction test case
1 parent 7e97aec commit 71a7627

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

simple_history/tests/tests/test_models.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
from __future__ import unicode_literals
22

33
from datetime import datetime, timedelta
4-
try:
5-
from unittest import skipUnless
6-
except ImportError:
7-
from unittest2 import skipUnless
4+
import unittest
85

96
import django
10-
try:
11-
from django.contrib.auth import get_user_model
12-
User = get_user_model()
13-
except ImportError: # django 1.4 compatibility
14-
from django.contrib.auth.models import User
157
from django.db import models
168
from django.db.models.loading import get_model
179
from django.db.models.fields.proxy import OrderWrt
@@ -29,6 +21,16 @@
2921
)
3022
from ..external.models import ExternalModel2, ExternalModel4
3123

24+
try:
25+
from unittest import skipUnless
26+
except ImportError:
27+
from unittest2 import skipUnless
28+
try:
29+
from django.contrib.auth import get_user_model
30+
User = get_user_model()
31+
except ImportError: # django 1.4 compatibility
32+
from django.contrib.auth.models import User
33+
3234
today = datetime(2021, 1, 1, 10, 0)
3335
tomorrow = today + timedelta(days=1)
3436
yesterday = today - timedelta(days=1)
@@ -324,7 +326,7 @@ def test_register_custome_records(self):
324326
self.assertEqual(expected, str(voter.history.all()[0])[:len(expected)])
325327

326328

327-
class CreateHistoryModelTests(TestCase):
329+
class CreateHistoryModelTests(unittest.TestCase):
328330

329331
def test_create_history_model_with_one_to_one_field_to_integer_field(self):
330332
records = HistoricalRecords()

0 commit comments

Comments
 (0)