Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-24 16:56:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Start converting latest develop unittests to py3

Browse source
This commit is contained in:
Griatch 2019-03-04 23:20:07 +01:00
parent aa8429c535
commit 4cbf9a02be
4 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/commands/default/system.py
View file

@ -22,7 +22,7 @@ from evennia.accounts.models import AccountDB
from evennia.utils import logger, utils, gametime, create, search
from evennia.utils.eveditor import EvEditor
from evennia.utils.evtable import EvTable
from evennia.utils.utils import crop, class_from_module, to_unicode
from evennia.utils.utils import crop, class_from_module
COMMAND_DEFAULT_CLASS = class_from_module(settings.COMMAND_DEFAULT_CLASS)

2
evennia/prototypes/spawner.py
View file

@ -689,7 +689,7 @@ def spawn(*prototypes, **kwargs):
"""
# search string (=prototype_key) from input
prototypes = [protlib.search_prototype(prot, require_single=True)[0]
if isinstance(prot, basestring) else prot
if isinstance(prot, str) else prot
for prot in prototypes]
# get available protparents

37
evennia/server/tests/test_amp_connection.py
View file

@ -18,30 +18,29 @@ from evennia.utils import create
from twisted.internet.base import DelayedCall
DelayedCall.debug = True
@patch("evennia.server.initial_setup.get_god_account",
MagicMock(return_value=create.account("TestAMPAccount", "test@test.com", "testpassword")))
class _TestAMP(TwistedTestCase):
def setUp(self):
super(_TestAMP, self).setUp()
with patch("evennia.server.initial_setup.get_god_account") as mockgod:
self.account = create.account("TestAMPAccount", "test@test.com", "testpassword")
mockgod.return_value = self.account
self.server = server.Evennia(MagicMock())
self.server.sessions.data_in = MagicMock()
self.server.sessions.data_out = MagicMock()
self.amp_client_factory = amp_client.AMPClientFactory(self.server)
self.amp_client = self.amp_client_factory.buildProtocol("127.0.0.1")
self.session = MagicMock() # serversession.ServerSession()
self.session.sessid = 1
self.server.sessions[1] = self.session
self.server = server.Evennia(MagicMock())
self.server.sessions.data_in = MagicMock()
self.server.sessions.data_out = MagicMock()
self.amp_client_factory = amp_client.AMPClientFactory(self.server)
self.amp_client = self.amp_client_factory.buildProtocol("127.0.0.1")
self.session = MagicMock() # serversession.ServerSession()
self.session.sessid = 1
self.server.sessions[1] = self.session
self.portal = portal.Portal(MagicMock())
self.portalsession = session.Session()
self.portalsession.sessid = 1
self.portal.sessions[1] = self.portalsession
self.portal.sessions.data_in = MagicMock()
self.portal.sessions.data_out = MagicMock()
self.amp_server_factory = amp_server.AMPServerFactory(self.portal)
self.amp_server = self.amp_server_factory.buildProtocol("127.0.0.1")
self.portal = portal.Portal(MagicMock())
self.portalsession = session.Session()
self.portalsession.sessid = 1
self.portal.sessions[1] = self.portalsession
self.portal.sessions.data_in = MagicMock()
self.portal.sessions.data_out = MagicMock()
self.amp_server_factory = amp_server.AMPServerFactory(self.portal)
self.amp_server = self.amp_server_factory.buildProtocol("127.0.0.1")
def tearDown(self):
self.account.delete()

2
evennia/utils/test_resources.py
View file

@ -38,7 +38,7 @@ def unload_module(module):
loaded once).
"""
if isinstance(module, basestring):
if isinstance(module, str):
modulename = module
elif hasattr(module, "__module__"):
modulename = module.__module__