Annikka/evennia
1
0
Fork 0
Code Issues Pull requests 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 90b42ca6fb
commit b3dc85a4dc
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 import logger, utils, gametime, create, search
from evennia.utils.eveditor import EvEditor from evennia.utils.eveditor import EvEditor
from evennia.utils.evtable import EvTable 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) 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 # search string (=prototype_key) from input
prototypes = [protlib.search_prototype(prot, require_single=True)[0] 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] for prot in prototypes]
# get available protparents # 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 from twisted.internet.base import DelayedCall
DelayedCall.debug = True DelayedCall.debug = True
@patch("evennia.server.initial_setup.get_god_account",
MagicMock(return_value=create.account("TestAMPAccount", "test@test.com", "testpassword")))
class _TestAMP(TwistedTestCase): class _TestAMP(TwistedTestCase):
def setUp(self): def setUp(self):
super(_TestAMP, self).setUp() super(_TestAMP, self).setUp()
with patch("evennia.server.initial_setup.get_god_account") as mockgod: self.server = server.Evennia(MagicMock())
self.account = create.account("TestAMPAccount", "test@test.com", "testpassword") self.server.sessions.data_in = MagicMock()
mockgod.return_value = self.account self.server.sessions.data_out = MagicMock()
self.server = server.Evennia(MagicMock()) self.amp_client_factory = amp_client.AMPClientFactory(self.server)
self.server.sessions.data_in = MagicMock() self.amp_client = self.amp_client_factory.buildProtocol("127.0.0.1")
self.server.sessions.data_out = MagicMock() self.session = MagicMock() # serversession.ServerSession()
self.amp_client_factory = amp_client.AMPClientFactory(self.server) self.session.sessid = 1
self.amp_client = self.amp_client_factory.buildProtocol("127.0.0.1") self.server.sessions[1] = self.session
self.session = MagicMock() # serversession.ServerSession()
self.session.sessid = 1
self.server.sessions[1] = self.session
self.portal = portal.Portal(MagicMock()) self.portal = portal.Portal(MagicMock())
self.portalsession = session.Session() self.portalsession = session.Session()
self.portalsession.sessid = 1 self.portalsession.sessid = 1
self.portal.sessions[1] = self.portalsession self.portal.sessions[1] = self.portalsession
self.portal.sessions.data_in = MagicMock() self.portal.sessions.data_in = MagicMock()
self.portal.sessions.data_out = MagicMock() self.portal.sessions.data_out = MagicMock()
self.amp_server_factory = amp_server.AMPServerFactory(self.portal) self.amp_server_factory = amp_server.AMPServerFactory(self.portal)
self.amp_server = self.amp_server_factory.buildProtocol("127.0.0.1") self.amp_server = self.amp_server_factory.buildProtocol("127.0.0.1")
def tearDown(self): def tearDown(self):
self.account.delete() self.account.delete()

2
evennia/utils/test_resources.py
View file

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