Skip to content

Commit 1889387

Browse files
run only one custom model test matrix (#761)
1 parent 8999475 commit 1889387

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

auditlog_tests/tests.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import random
55
import warnings
66
from datetime import timezone
7-
from unittest import mock
7+
from unittest import mock, skipIf
88
from unittest.mock import patch
99

1010
import freezegun
@@ -2812,7 +2812,7 @@ def post_log_receiver(sender, instance, action, error, log_entry, **_kwargs):
28122812

28132813
self.assertSignals(LogEntry.Action.DELETE)
28142814

2815-
@patch(f"{LogEntry.__module__}.{LogEntry.__name__}.objects")
2815+
@patch.object(LogEntry, "objects")
28162816
def test_signals_errors(self, log_entry_objects_mock):
28172817
class CustomSignalError(BaseException):
28182818
pass
@@ -3159,10 +3159,13 @@ def get_context_data(self):
31593159
"role": "admin",
31603160
}
31613161

3162+
@skipIf(
3163+
settings.AUDITLOG_LOGENTRY_MODEL == "auditlog.LogEntry",
3164+
"Do not run on defualt log entry model",
3165+
)
31623166
def test_extra_data_role(self):
31633167
log = self.obj.history.first()
3164-
if settings.AUDITLOG_LOGENTRY_MODEL != "auditlog.LogEntry":
3165-
self.assertEqual(log.role, "admin")
3168+
self.assertEqual(log.role, "admin")
31663169

31673170

31683171
class ExtraDataWithRoleLazyLoadTest(WithExtraDataMixin, SimpleModelTest):
@@ -3172,10 +3175,13 @@ def get_context_data(self):
31723175
"role": lambda: "admin",
31733176
}
31743177

3178+
@skipIf(
3179+
settings.AUDITLOG_LOGENTRY_MODEL == "auditlog.LogEntry",
3180+
"Do not run on defualt log entry model",
3181+
)
31753182
def test_extra_data_role(self):
31763183
log = self.obj.history.first()
3177-
if settings.AUDITLOG_LOGENTRY_MODEL != "auditlog.LogEntry":
3178-
self.assertEqual(log.role, "admin")
3184+
self.assertEqual(log.role, "admin")
31793185

31803186

31813187
class GetLogEntryModelTest(TestCase):

tox.ini

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
[tox]
22
envlist =
3-
{py310,py311}-{customlogmodel,defaultlogmodel}-django42
4-
{py310,py311,py312}-{customlogmodel,defaultlogmodel}-django50
5-
{py310,py311,py312,py313}-{customlogmodel,defaultlogmodel}-django51
6-
{py310,py311,py312,py313}-{customlogmodel,defaultlogmodel}-django52
7-
{py312,py313}-{customlogmodel,defaultlogmodel}-djangomain
3+
{py312}-customlogmodel-django52
4+
{py310,py311}-django42
5+
{py310,py311,py312}-django50
6+
{py310,py311,py312,py313}-django51
7+
{py310,py311,py312,py313}-django52
8+
{py312,py313}-djangomain
89
py310-docs
910
py310-lint
1011
py310-checkmigrations

0 commit comments

Comments
 (0)