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

Resolve merge errors

Browse source
This commit is contained in:
Griatch 2021-04-24 22:47:06 +02:00
commit ad0c0f39d0
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@ class TestServer(TestCase):
_FLUSH_CACHE=DEFAULT,
connection=DEFAULT,
_IDMAPPER_CACHE_MAXSIZE=1000,
_MAINTENANCE_COUNT=600 - 1,
_MAINTENANCE_COUNT=5 - 1,
ServerConfig=DEFAULT,
) as mocks:
mocks["connection"].close = MagicMock()
@ -65,7 +65,7 @@ class TestServer(TestCase):
_FLUSH_CACHE=DEFAULT,
connection=DEFAULT,
_IDMAPPER_CACHE_MAXSIZE=1000,
_MAINTENANCE_COUNT=3600 - 1,
_MAINTENANCE_COUNT=60 - 1,
_LAST_SERVER_TIME_SNAPSHOT=0,
ServerConfig=DEFAULT,
) as mocks:
@ -82,7 +82,7 @@ class TestServer(TestCase):
_FLUSH_CACHE=DEFAULT,
connection=DEFAULT,
_IDMAPPER_CACHE_MAXSIZE=1000,
_MAINTENANCE_COUNT=3700 - 1,
_MAINTENANCE_COUNT=61 - 1,
_LAST_SERVER_TIME_SNAPSHOT=0,
ServerConfig=DEFAULT,
) as mocks:
@ -100,7 +100,7 @@ class TestServer(TestCase):
_FLUSH_CACHE=DEFAULT,
connection=DEFAULT,
_IDMAPPER_CACHE_MAXSIZE=1000,
_MAINTENANCE_COUNT=(3600 * 7) - 1,
_MAINTENANCE_COUNT=(60 * 7) - 1,
_LAST_SERVER_TIME_SNAPSHOT=0,
ServerConfig=DEFAULT,
) as mocks: