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

Fix errors in testing.

Browse source
This commit is contained in:
Griatch 2017-02-17 09:32:15 +01:00
parent 1fbb4c4358
commit 22e57db4a7
5 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/commands/default/building.py
View file

@ -20,7 +20,7 @@ COMMAND_DEFAULT_CLASS = class_from_module(settings.COMMAND_DEFAULT_CLASS)
# limit symbol import for API # limit symbol import for API
__all__ = ("ObjManipCommand", "CmdSetObjAlias", "CmdCopy", __all__ = ("ObjManipCommand", "CmdSetObjAlias", "CmdCopy",
"CmdCpAttr", "CmdMvAttr", "CmdCreate", "CmdCpAttr", "CmdMvAttr", "CmdCreate",
"CmdSetDesc", "CmdDestroy", "CmdDig", "CmdTunnel", "CmdLink", "CmdDesc", "CmdDestroy", "CmdDig", "CmdTunnel", "CmdLink",
"CmdUnLink", "CmdSetHome", "CmdListCmdSets", "CmdName", "CmdUnLink", "CmdSetHome", "CmdListCmdSets", "CmdName",
"CmdOpen", "CmdSetAttribute", "CmdTypeclass", "CmdWipe", "CmdOpen", "CmdSetAttribute", "CmdTypeclass", "CmdWipe",
"CmdLock", "CmdExamine", "CmdFind", "CmdTeleport", "CmdLock", "CmdExamine", "CmdFind", "CmdTeleport",
@ -533,7 +533,7 @@ def _desc_quit(caller):
caller.attributes.remove("evmenu_target") caller.attributes.remove("evmenu_target")
caller.msg("Exited editor.") caller.msg("Exited editor.")
class CmdSetDesc(COMMAND_DEFAULT_CLASS): class CmdDesc(COMMAND_DEFAULT_CLASS):
""" """
describe an object or the current room. describe an object or the current room.

4
evennia/commands/default/cmdset_character.py
View file

@ -25,7 +25,7 @@ class CharacterCmdSet(CmdSet):
self.add(general.CmdInventory()) self.add(general.CmdInventory())
self.add(general.CmdPose()) self.add(general.CmdPose())
self.add(general.CmdNick()) self.add(general.CmdNick())
self.add(general.CmdDesc()) self.add(general.CmdSetDesc())
self.add(general.CmdGet()) self.add(general.CmdGet())
self.add(general.CmdDrop()) self.add(general.CmdDrop())
self.add(general.CmdGive()) self.add(general.CmdGive())
@ -63,7 +63,7 @@ class CharacterCmdSet(CmdSet):
self.add(building.CmdWipe()) self.add(building.CmdWipe())
self.add(building.CmdSetAttribute()) self.add(building.CmdSetAttribute())
self.add(building.CmdName()) self.add(building.CmdName())
self.add(building.CmdSetDesc()) self.add(building.CmdDesc())
self.add(building.CmdCpAttr()) self.add(building.CmdCpAttr())
self.add(building.CmdMvAttr()) self.add(building.CmdMvAttr())
self.add(building.CmdCopy()) self.add(building.CmdCopy())

6
evennia/commands/default/general.py
View file

@ -9,7 +9,7 @@ COMMAND_DEFAULT_CLASS = utils.class_from_module(settings.COMMAND_DEFAULT_CLASS)
# limit symbol import for API # limit symbol import for API
__all__ = ("CmdHome", "CmdLook", "CmdNick", __all__ = ("CmdHome", "CmdLook", "CmdNick",
"CmdInventory", "CmdGet", "CmdDrop", "CmdGive", "CmdInventory", "CmdSetDesc", "CmdGet", "CmdDrop", "CmdGive",
"CmdSay", "CmdPose", "CmdAccess") "CmdSay", "CmdPose", "CmdAccess")
@ -356,7 +356,7 @@ class CmdGive(COMMAND_DEFAULT_CLASS):
target.msg("%s gives you %s." % (caller.key, to_give.key)) target.msg("%s gives you %s." % (caller.key, to_give.key))
class CmdDesc(COMMAND_DEFAULT_CLASS): class CmdSetDesc(COMMAND_DEFAULT_CLASS):
""" """
describe yourself describe yourself
@ -367,7 +367,7 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
will be visible to people when they will be visible to people when they
look at you. look at you.
""" """
key = "desc" key = "setdesc"
locks = "cmd:all()" locks = "cmd:all()"
arg_regex = r"\s|$" arg_regex = r"\s|$"

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

@ -52,7 +52,9 @@ class CommandTest(EvenniaTest):
caller = caller if caller else self.char1 caller = caller if caller else self.char1
receiver = receiver if receiver else caller receiver = receiver if receiver else caller
cmdobj.caller = caller cmdobj.caller = caller
cmdobj.cmdstring = cmdstring if cmdstring else cmdobj.key cmdobj.cmdname = cmdstring if cmdstring else cmdobj.key
cmdobj.raw_cmdname = cmdobj.cmdname
cmdobj.cmdstring = cmdobj.cmdname # deprecated
cmdobj.args = args cmdobj.args = args
cmdobj.cmdset = cmdset cmdobj.cmdset = cmdset
cmdobj.session = SESSIONS.session_from_sessid(1) cmdobj.session = SESSIONS.session_from_sessid(1)
@ -229,7 +231,7 @@ class TestBuilding(CommandTest):
self.call(building.CmdName(), "Obj2=Obj3", "Object's name changed to 'Obj3'.") self.call(building.CmdName(), "Obj2=Obj3", "Object's name changed to 'Obj3'.")
def test_desc(self): def test_desc(self):
self.call(building.CmdSetDesc(), "Obj2=TestDesc", "The description was set on Obj2(#5).") self.call(building.CmdDesc(), "Obj2=TestDesc", "The description was set on Obj2(#5).")
def test_wipe(self): def test_wipe(self):
self.call(building.CmdDestroy(), "Obj", "Obj was destroyed.") self.call(building.CmdDestroy(), "Obj", "Obj was destroyed.")

10
evennia/contrib/tests.py
View file

@ -200,12 +200,12 @@ class TestExtendedRoom(CommandTest):
self.call(extended_room.CmdExtendedLook(), "nonexistent", "Could not find 'nonexistent'.") self.call(extended_room.CmdExtendedLook(), "nonexistent", "Could not find 'nonexistent'.")
def test_cmdextendeddesc(self): def test_cmdextendeddesc(self):
self.call(extended_room.CmdExtendedDesc(), "", "Details on Room", cmdstring="@detail") self.call(extended_room.CmdExtendedDesc(), "", "Details on Room", cmdstring="detail")
self.call(extended_room.CmdExtendedDesc(), "thingie = newdetail with spaces", self.call(extended_room.CmdExtendedDesc(), "thingie = newdetail with spaces",
"Set Detail thingie to 'newdetail with spaces'.", cmdstring="@detail") "Set Detail thingie to 'newdetail with spaces'.", cmdstring="detail")
self.call(extended_room.CmdExtendedDesc(), "thingie", "Detail 'thingie' on Room:\n", cmdstring="@detail") self.call(extended_room.CmdExtendedDesc(), "thingie", "Detail 'thingie' on Room:\n", cmdstring="detail")
self.call(extended_room.CmdExtendedDesc(), "/del thingie", "Detail thingie deleted, if it existed.", cmdstring="@detail") self.call(extended_room.CmdExtendedDesc(), "/del thingie", "Detail thingie deleted, if it existed.", cmdstring="detail")
self.call(extended_room.CmdExtendedDesc(), "thingie", "Detail 'thingie' not found.", cmdstring="@detail") self.call(extended_room.CmdExtendedDesc(), "thingie", "Detail 'thingie' not found.", cmdstring="detail")
self.call(extended_room.CmdExtendedDesc(), "", "Descriptions on Room:") self.call(extended_room.CmdExtendedDesc(), "", "Descriptions on Room:")
def test_cmdgametime(self): def test_cmdgametime(self):