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

Fix merge conflicts with say-branch

Browse source
This commit is contained in:
Griatch 2017-07-21 11:06:38 +02:00
commit 8600e8c546
3 changed files with 152 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,7 @@ class TestGeneral(CommandTest):
self.call(general.CmdSay(), "Testing", "You say, \"Testing\"")
def test_whisper(self):
self.call(general.CmdWhisper(), "Obj = Testing", "You whisper to Obj, \"Testing\"")
self.call(general.CmdWhisper(), "Obj = Testing", "You whisper to Obj, \"Testing\"", caller=self.char2)
def test_access(self):
self.call(general.CmdAccess(), "", "Permission Hierarchy (climbing):")