Skip to content

Commit 6931c45

Browse files
authored
Merge pull request #645 from jazzband/fix/tests
2 parents e002f4b + 0f74be9 commit 6931c45

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

constance/management/commands/constance.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ def handle(self, command, key=None, value=None, *args, **options):
7070
for k, v in get_values().items():
7171
self.stdout.write(f"{k}\t{v}", ending="\n")
7272
elif command == self.REMOVE_STALE_KEYS:
73-
prefix = getattr(settings, 'CONSTANCE_DATABASE_PREFIX', '')
74-
actual_keys = [f'{prefix}{key}' for key in settings.CONSTANCE_CONFIG]
73+
prefix = getattr(settings, "CONSTANCE_DATABASE_PREFIX", "")
74+
actual_keys = [f"{prefix}{key}" for key in settings.CONSTANCE_CONFIG]
7575
stale_records = Constance.objects.exclude(key__in=actual_keys)
7676
if stale_records:
7777
self.stdout.write("The following record will be deleted:", ending="\n")

tests/test_cli.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
from django.conf import settings
77
from django.core.management import CommandError
88
from django.core.management import call_command
9-
from django.test import TransactionTestCase, override_settings
9+
from django.test import TransactionTestCase
10+
from django.test import override_settings
1011
from django.utils import timezone
1112
from django.utils.encoding import smart_str
1213

13-
from constance.models import Constance
1414
from constance import config
15+
from constance.models import Constance
1516

1617

1718
class CliTestCase(TransactionTestCase):
@@ -51,12 +52,12 @@ def test_list(self):
5152
)
5253

5354
def test_get(self):
54-
call_command("constance", *("get EMAIL_VALUE".split()), stdout=self.out)
55+
call_command("constance", *(["get", "EMAIL_VALUE"]), stdout=self.out)
5556

5657
self.assertEqual(self.out.getvalue().strip(), "[email protected]")
5758

5859
def test_set(self):
59-
call_command("constance", *("set EMAIL_VALUE [email protected]".split()), stdout=self.out)
60+
call_command("constance", *(["set", "EMAIL_VALUE", "[email protected]"]), stdout=self.out)
6061

6162
self.assertEqual(config.EMAIL_VALUE, "[email protected]")
6263

@@ -120,13 +121,13 @@ def test_delete_stale_records(self):
120121
self.assertEqual(Constance.objects.count(), initial_count, msg=self.out)
121122

122123
@override_settings(
123-
CONSTANCE_DATABASE_PREFIX='constance:',
124+
CONSTANCE_DATABASE_PREFIX="constance:",
124125
)
125126
def test_delete_stale_records_respects_prefix(self):
126127
self._populate_database_with_default_values()
127128
initial_count = Constance.objects.count()
128129

129-
call_command('constance', 'remove_stale_keys', stdout=self.out)
130+
call_command("constance", "remove_stale_keys", stdout=self.out)
130131

131132
self.assertEqual(Constance.objects.count(), initial_count, msg=self.out)
132133

@@ -136,4 +137,4 @@ def _populate_database_with_default_values(self):
136137
in settings since that's not done automatically at startup
137138
"""
138139
for key, (value, *_) in settings.CONSTANCE_CONFIG.items():
139-
Constance.objects.create(key=f'{getattr(settings, "CONSTANCE_DATABASE_PREFIX", "")}{key}', value=value)
140+
Constance.objects.create(key=f"{getattr(settings, 'CONSTANCE_DATABASE_PREFIX', '')}{key}", value=value)

0 commit comments

Comments
 (0)