Skip to content

Refactor according to comments in PR #4848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2017
Merged

Refactor according to comments in PR #4848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions tests/test_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@

class CompatTests(TestCase):

def setUp(self):
self.original_django_version = compat.django.VERSION
self.original_transaction = compat.transaction

def tearDown(self):
compat.django.VERSION = self.original_django_version
compat.transaction = self.original_transaction

def test_total_seconds(self):
class MockTimedelta(object):
days = 1
Expand All @@ -17,23 +25,16 @@ class MockTimedelta(object):
def test_get_remote_field_with_old_django_version(self):
class MockField(object):
rel = 'example_rel'
original_django_version = compat.django.VERSION
compat.django.VERSION = (1, 8)
assert compat.get_remote_field(MockField(), default='default_value') == 'example_rel'
assert compat.get_remote_field(object(), default='default_value') == 'default_value'
compat.django.VERSION = original_django_version

def test_get_remote_field_with_new_django_version(self):
class MockField(object):
remote_field = 'example_remote_field'
original_django_version = compat.django.VERSION
compat.django.VERSION = (1, 10)
assert compat.get_remote_field(MockField(), default='default_value') == 'example_remote_field'
assert compat.get_remote_field(object(), default='default_value') == 'default_value'
compat.django.VERSION = original_django_version

def test_patch_in_http_method_names(self):
assert 'patch' in compat.View.http_method_names

def test_set_rollback_for_transaction_in_managed_mode(self):
class MockTransaction(object):
Expand All @@ -52,7 +53,6 @@ def rollback(self):
def leave_transaction_management(self):
self.called_leave_transaction_management = True

original_transaction = compat.transaction
dirty_mock_transaction = MockTransaction()
compat.transaction = dirty_mock_transaction
compat.set_rollback()
Expand All @@ -65,5 +65,3 @@ def leave_transaction_management(self):
compat.set_rollback()
assert clean_mock_transaction.called_rollback is False
assert clean_mock_transaction.called_leave_transaction_management is True

compat.transaction = original_transaction