From 91ffde5eafe23254379c5edb5cc26138797004c2 Mon Sep 17 00:00:00 2001 From: Griatch Date: Mon, 6 Feb 2017 20:20:38 +0100 Subject: [PATCH] Fix errors caused by the change of the get_and_merge_cmdset callsign. Makes unittests work correctly again. --- evennia/commands/default/building.py | 4 ++-- evennia/commands/tests.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py index a67316daf5..acaa840b79 100644 --- a/evennia/commands/default/building.py +++ b/evennia/commands/default/building.py @@ -2046,7 +2046,7 @@ class CmdExamine(ObjManipCommand): self.msg(caller.at_look(obj)) return # using callback for printing result whenever function returns. - get_and_merge_cmdsets(obj, self.session, self.player, obj, "object").addCallback(get_cmdset_callback) + get_and_merge_cmdsets(obj, self.session, self.player, obj, "object", self.raw_string).addCallback(get_cmdset_callback) else: self.msg("You need to supply a target to examine.") return @@ -2089,7 +2089,7 @@ class CmdExamine(ObjManipCommand): else: mergemode = "object" # using callback to print results whenever function returns. - get_and_merge_cmdsets(obj, self.session, self.player, obj, mergemode).addCallback(get_cmdset_callback) + get_and_merge_cmdsets(obj, self.session, self.player, obj, mergemode, self.raw_string).addCallback(get_cmdset_callback) class CmdFind(COMMAND_DEFAULT_CLASS): diff --git a/evennia/commands/tests.py b/evennia/commands/tests.py index d063514e75..e5037154cb 100644 --- a/evennia/commands/tests.py +++ b/evennia/commands/tests.py @@ -260,7 +260,7 @@ class TestGetAndMergeCmdSets(TwistedTestCase, EvenniaTest): a = self.cmdset_a a.no_channels = True self.set_cmdsets(self.session, a) - deferred = cmdhandler.get_and_merge_cmdsets(self.session, self.session, None, None, "session") + deferred = cmdhandler.get_and_merge_cmdsets(self.session, self.session, None, None, "session", "") def _callback(cmdset): self.assertEqual(cmdset.key, "A") deferred.addCallback(_callback) @@ -271,7 +271,7 @@ class TestGetAndMergeCmdSets(TwistedTestCase, EvenniaTest): a = self.cmdset_a a.no_channels = True self.set_cmdsets(self.player, a) - deferred = cmdhandler.get_and_merge_cmdsets(self.player, None, self.player, None, "player") + deferred = cmdhandler.get_and_merge_cmdsets(self.player, None, self.player, None, "player", "") # get_and_merge_cmdsets converts to lower-case internally. def _callback(cmdset): pcmdset = PlayerCmdSet() @@ -284,7 +284,7 @@ class TestGetAndMergeCmdSets(TwistedTestCase, EvenniaTest): def test_from_object(self): self.set_cmdsets(self.obj1, self.cmdset_a) - deferred = cmdhandler.get_and_merge_cmdsets(self.obj1, None, None, self.obj1, "object") + deferred = cmdhandler.get_and_merge_cmdsets(self.obj1, None, None, self.obj1, "object", "") # get_and_merge_cmdsets converts to lower-case internally. _callback = lambda cmdset: self.assertEqual(sum(1 for cmd in cmdset.commands if cmd.key in ("a", "b", "c", "d")), 4) deferred.addCallback(_callback) @@ -295,7 +295,7 @@ class TestGetAndMergeCmdSets(TwistedTestCase, EvenniaTest): a.no_exits = True a.no_channels = True self.set_cmdsets(self.obj1, a, b, c, d) - deferred = cmdhandler.get_and_merge_cmdsets(self.obj1, None, None, self.obj1, "object") + deferred = cmdhandler.get_and_merge_cmdsets(self.obj1, None, None, self.obj1, "object", "") def _callback(cmdset): self.assertTrue(cmdset.no_exits) self.assertTrue(cmdset.no_channels) @@ -314,7 +314,7 @@ class TestGetAndMergeCmdSets(TwistedTestCase, EvenniaTest): 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") + deferred = cmdhandler.get_and_merge_cmdsets(self.session, self.session, self.player, self.char1, "session", "") def _callback(cmdset): pcmdset = PlayerCmdSet() pcmdset.at_cmdset_creation() @@ -331,7 +331,7 @@ class TestGetAndMergeCmdSets(TwistedTestCase, EvenniaTest): b.duplicates = True d.duplicates = True self.set_cmdsets(self.obj1, a, b, c, d) - deferred = cmdhandler.get_and_merge_cmdsets(self.obj1, None, None, self.obj1, "object") + deferred = cmdhandler.get_and_merge_cmdsets(self.obj1, None, None, self.obj1, "object", "") def _callback(cmdset): self.assertEqual(len(cmdset.commands), 9) deferred.addCallback(_callback)