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

Fix edge cases in channelhandler and make unittests work.

Browse source
This commit is contained in:
Griatch 2016-10-16 19:04:05 +02:00
parent e39e1bdd45
commit cd9c11f6a8
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
evennia/commands/tests.py
View file

@ -3,7 +3,7 @@ Unit testing for the Command system itself.
"""
from evennia.utils.test_resources import EvenniaTest, SESSIONS, TestCase
from evennia.utils.test_resources import EvenniaTest, TestCase
from evennia.commands.cmdset import CmdSet
from evennia.commands.command import Command
@ -307,9 +307,11 @@ class TestGetAndMergeCmdSets(TwistedTestCase, EvenniaTest):
import evennia
from evennia.commands.default.cmdset_player import PlayerCmdSet
from evennia.comms.channelhandler import CHANNEL_HANDLER
testchannel = evennia.create_channel("testchannel", locks="listen:all();send:all()")
testchannel = evennia.create_channel("channeltest", locks="listen:all();send:all()")
CHANNEL_HANDLER.add(testchannel)
CHANNEL_HANDLER.update()
self.assertTrue(testchannel.connect(self.player))
self.assertTrue(testchannel.has_connection(self.player))
a, b, c, d = self.cmdset_a, self.cmdset_b, self.cmdset_c, self.cmdset_d
self.set_cmdsets(self.player, a, b, c, d)
deferred = cmdhandler.get_and_merge_cmdsets(self.session, self.session, self.player, self.char1, "session")
@ -334,9 +336,3 @@ class TestGetAndMergeCmdSets(TwistedTestCase, EvenniaTest):
self.assertEqual(len(cmdset.commands), 9)
deferred.addCallback(_callback)
return deferred