Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make scripts/objects lists use EvMore. Change EvMore to not justify by default.

Browse source
This commit is contained in:
Griatch 2020-01-11 15:49:12 +01:00
parent b5aee2c41e
commit 69d85bd184
221 changed files with 2190 additions and 6810 deletions
Download patch file Download diff file Expand all files Collapse all files

24
evennia/server/tests/test_server.py
View file

@ -70,9 +70,7 @@ class TestServer(TestCase):
) as mocks:
mocks["connection"].close = MagicMock()
mocks["ServerConfig"].objects.conf = MagicMock(return_value=100)
with patch(
"evennia.server.server.evennia.ScriptDB.objects.validate"
) as mock:
with patch("evennia.server.server.evennia.ScriptDB.objects.validate") as mock:
self.server._server_maintenance()
mocks["_FLUSH_CACHE"].assert_called_with(1000)
mock.assert_called()
@ -141,9 +139,7 @@ class TestServer(TestCase):
mocks["time"].time = MagicMock(return_value=1000)
mocks["ServerConfig"].objects.conf = MagicMock(return_value=100)
mocks["SESSIONS"].values = MagicMock(
return_value=[sess1, sess2, sess3, sess4]
)
mocks["SESSIONS"].values = MagicMock(return_value=[sess1, sess2, sess3, sess4])
mocks["SESSIONS"].disconnect = MagicMock()
self.server._server_maintenance()
@ -152,9 +148,7 @@ class TestServer(TestCase):
mocks["SESSIONS"].disconnect.assert_has_calls(calls, any_order=True)
def test_evennia_start(self):
with patch.multiple(
"evennia.server.server", time=DEFAULT, service=DEFAULT
) as mocks:
with patch.multiple("evennia.server.server", time=DEFAULT, service=DEFAULT) as mocks:
mocks["time"].time = MagicMock(return_value=1000)
evennia = self.server.Evennia(MagicMock())
@ -202,9 +196,7 @@ class TestServer(TestCase):
def test_initial_setup(self):
from evennia.utils.create import create_account
acct = create_account(
"TestSuperuser", "test@test.com", "testpassword", is_superuser=True
)
acct = create_account("TestSuperuser", "test@test.com", "testpassword", is_superuser=True)
with patch.multiple(
"evennia.server.initial_setup", reset_server=DEFAULT, AccountDB=DEFAULT
@ -217,9 +209,7 @@ class TestServer(TestCase):
def test_initial_setup_retry(self):
from evennia.utils.create import create_account
acct = create_account(
"TestSuperuser2", "test@test.com", "testpassword", is_superuser=True
)
acct = create_account("TestSuperuser2", "test@test.com", "testpassword", is_superuser=True)
with patch.multiple(
"evennia.server.initial_setup",
@ -246,9 +236,7 @@ class TestServer(TestCase):
with patch("evennia.objects.models.ObjectDB") as mockobj:
with patch("evennia.server.server.AccountDB") as mockacct:
mockacct.get_all_cached_instances = MagicMock(
return_value=[acct1, acct2]
)
mockacct.get_all_cached_instances = MagicMock(return_value=[acct1, acct2])
mockobj.get_all_cached_instances = MagicMock(return_value=[obj1, obj2])
mockobj.objects.clear_all_sessids = MagicMock()