Apply black to cleanup code
This commit is contained in:
parent
45ed27c7f1
commit
a83f21ef2f
33 changed files with 256 additions and 194 deletions
|
|
@ -2316,9 +2316,11 @@ def main():
|
|||
if option in ("makemessages", "compilemessages"):
|
||||
# some commands don't require the presence of a game directory to work
|
||||
need_gamedir = False
|
||||
if CURRENT_DIR != EVENNIA_LIB:
|
||||
print("You must stand in the evennia/evennia/ folder (where the 'locale/' "
|
||||
"folder is located) to run this command.")
|
||||
if CURRENT_DIR != EVENNIA_LIB:
|
||||
print(
|
||||
"You must stand in the evennia/evennia/ folder (where the 'locale/' "
|
||||
"folder is located) to run this command."
|
||||
)
|
||||
sys.exit()
|
||||
|
||||
if option in ("shell", "check", "makemigrations", "createsuperuser", "shell_plus"):
|
||||
|
|
|
|||
|
|
@ -423,6 +423,7 @@ class Evennia:
|
|||
logger.log_msg("Evennia Server successfully restarted in 'reset' mode.")
|
||||
elif mode == "shutdown":
|
||||
from evennia.objects.models import ObjectDB
|
||||
|
||||
self.at_server_cold_start()
|
||||
# clear eventual lingering session storages
|
||||
ObjectDB.objects.clear_all_sessids()
|
||||
|
|
|
|||
|
|
@ -197,7 +197,6 @@ class TestServer(TestCase):
|
|||
|
||||
|
||||
class TestInitHooks(TestCase):
|
||||
|
||||
def setUp(self):
|
||||
|
||||
from evennia.utils import create
|
||||
|
|
|
|||
|
|
@ -16,15 +16,18 @@ class EvenniaTestSuiteRunner(DiscoverRunner):
|
|||
avoid running the large number of tests defined by Django
|
||||
|
||||
"""
|
||||
|
||||
def setup_test_environment(self, **kwargs):
|
||||
# the portal looping call starts before the unit-test suite so we
|
||||
# can't mock it - instead we stop it before starting the test - otherwise
|
||||
# we'd get unclean reactor errors across test boundaries.
|
||||
from evennia.server.portal.portal import PORTAL
|
||||
|
||||
PORTAL.maintenance_task.stop()
|
||||
|
||||
# initialize evennia itself
|
||||
import evennia
|
||||
|
||||
evennia._init()
|
||||
|
||||
from django.conf import settings
|
||||
|
|
@ -37,6 +40,7 @@ class EvenniaTestSuiteRunner(DiscoverRunner):
|
|||
|
||||
# remove testing flag after suite has run
|
||||
from django.conf import settings
|
||||
|
||||
settings._TEST_ENVIRONMENT = False
|
||||
|
||||
super().teardown_test_environment(**kwargs)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue