From 2c47d6a66b889b8b845e6fab9c26f2b8eac7bd99 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 1 May 2011 20:44:01 +0000 Subject: [PATCH] Made all unittests validate again. --- src/commands/default/building.py | 4 ++-- src/commands/default/tests.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commands/default/building.py b/src/commands/default/building.py index f5762dceb6..c97ae00d98 100644 --- a/src/commands/default/building.py +++ b/src/commands/default/building.py @@ -199,7 +199,7 @@ class CmdCopy(ObjManipCommand): if not to_obj_location: return - copiedobj = ObjectDB.objects.copy_object(from_obj, new_name=to_obj_name, + copiedobj = ObjectDB.objects.copy_object(from_obj, new_key=to_obj_name, new_location=to_obj_location, new_aliases=to_obj_aliases) if copiedobj: string = "Copied %s to '%s' (aliases: %s)." % (from_obj_name, to_obj_name, @@ -535,7 +535,7 @@ class CmdDestroy(MuxCommand): """ key = "@destroy" - aliases = "@delete" + aliases = ["@delete", "@del"] locks = "cmd:perm(destroy) or perm(Builders)" help_category = "Building" diff --git a/src/commands/default/tests.py b/src/commands/default/tests.py index b9f6d19d03..2ecf45cd8b 100644 --- a/src/commands/default/tests.py +++ b/src/commands/default/tests.py @@ -328,7 +328,7 @@ class TestDesc(BuildTest): self.assertEqual(self.obj1.db.desc, u"Test object") class TestDestroy(BuildTest): def test_call(self): - self.execute_cmd("@destroy obj1, obj2", "obj1 was deleted.\nobj2 was deleted") + self.execute_cmd("@destroy obj1, obj2", "obj1 was destroyed.\nobj2 was destroyed.") class TestFind(BuildTest): def test_call(self): self.execute_cmd("@find obj1", "One Match")