Skip to content

Commit 48b5aa7

Browse files
archy-rock3t-cloudtomchristie
authored andcommitted
Refactor according to comments in PR (#4848)
1 parent 9c8adb4 commit 48b5aa7

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

tests/test_compat.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55

66
class CompatTests(TestCase):
77

8+
def setUp(self):
9+
self.original_django_version = compat.django.VERSION
10+
self.original_transaction = compat.transaction
11+
12+
def tearDown(self):
13+
compat.django.VERSION = self.original_django_version
14+
compat.transaction = self.original_transaction
15+
816
def test_total_seconds(self):
917
class MockTimedelta(object):
1018
days = 1
@@ -17,23 +25,16 @@ class MockTimedelta(object):
1725
def test_get_remote_field_with_old_django_version(self):
1826
class MockField(object):
1927
rel = 'example_rel'
20-
original_django_version = compat.django.VERSION
2128
compat.django.VERSION = (1, 8)
2229
assert compat.get_remote_field(MockField(), default='default_value') == 'example_rel'
2330
assert compat.get_remote_field(object(), default='default_value') == 'default_value'
24-
compat.django.VERSION = original_django_version
2531

2632
def test_get_remote_field_with_new_django_version(self):
2733
class MockField(object):
2834
remote_field = 'example_remote_field'
29-
original_django_version = compat.django.VERSION
3035
compat.django.VERSION = (1, 10)
3136
assert compat.get_remote_field(MockField(), default='default_value') == 'example_remote_field'
3237
assert compat.get_remote_field(object(), default='default_value') == 'default_value'
33-
compat.django.VERSION = original_django_version
34-
35-
def test_patch_in_http_method_names(self):
36-
assert 'patch' in compat.View.http_method_names
3738

3839
def test_set_rollback_for_transaction_in_managed_mode(self):
3940
class MockTransaction(object):
@@ -52,7 +53,6 @@ def rollback(self):
5253
def leave_transaction_management(self):
5354
self.called_leave_transaction_management = True
5455

55-
original_transaction = compat.transaction
5656
dirty_mock_transaction = MockTransaction()
5757
compat.transaction = dirty_mock_transaction
5858
compat.set_rollback()
@@ -65,5 +65,3 @@ def leave_transaction_management(self):
6565
compat.set_rollback()
6666
assert clean_mock_transaction.called_rollback is False
6767
assert clean_mock_transaction.called_leave_transaction_management is True
68-
69-
compat.transaction = original_transaction

0 commit comments

Comments
 (0)