From 83570848d6869062c884b7965e995bc549dd8f1e Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 14 Feb 2016 08:47:06 +0100 Subject: [PATCH] Made all unittests pass again. --- evennia/commands/default/tests.py | 2 +- evennia/server/sessionhandler.py | 1 - evennia/utils/evform.py | 3 +-- evennia/utils/tests.py | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py index eaf1aa4191..7956d7f73f 100644 --- a/evennia/commands/default/tests.py +++ b/evennia/commands/default/tests.py @@ -68,7 +68,7 @@ class CommandTest(EvenniaTest): cmdobj.func() cmdobj.at_post_cmd() # clean out prettytable sugar - stored_msg = [args[0] for name, args, kwargs in receiver.msg.mock_calls] + stored_msg = [args[0] if args else kwargs.get("text",kwargs) for name, args, kwargs in receiver.msg.mock_calls] returned_msg = "||".join(_RE.sub("", mess) for mess in stored_msg) returned_msg = ansi.parse_ansi(returned_msg, strip_ansi=noansi).strip() if msg is not None: diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py index cd96b1916a..e873223e69 100644 --- a/evennia/server/sessionhandler.py +++ b/evennia/server/sessionhandler.py @@ -625,7 +625,6 @@ class ServerSessionHandler(SessionHandler): if session: for cmdname, (cmdargs, cmdkwargs) in kwargs.iteritems(): cname = cmdname.strip().lower() - print "sessionhandler.data_in:", session, kwargs try: if cname in _INPUT_FUNCS: _INPUT_FUNCS[cname](session, *cmdargs, **cmdkwargs) diff --git a/evennia/utils/evform.py b/evennia/utils/evform.py index 64962df26c..57b3a44c21 100644 --- a/evennia/utils/evform.py +++ b/evennia/utils/evform.py @@ -425,7 +425,7 @@ class EvForm(object): return unicode(ANSIString("\n").join([line for line in self.form])) def _test(): - "test evform" + "test evform. This is used by the unittest system." form = EvForm("evennia.utils.evform_test") # add data to each tagged form cell @@ -449,7 +449,6 @@ def _test(): # add the tables to the proper ids in the form form.map(tables={"A": tableA, "B": tableB}) - # unicode is required since the example contains non-ascii characters #print(unicode(form)) return form diff --git a/evennia/utils/tests.py b/evennia/utils/tests.py index b618ee728a..8e79891efb 100644 --- a/evennia/utils/tests.py +++ b/evennia/utils/tests.py @@ -348,8 +348,10 @@ from evennia.utils import evform class TestEvForm(TestCase): def test_form(self): + self.maxDiff = None self.assertEqual(unicode(evform._test()), u'.------------------------------------------------.\n| |\n| Name: \x1b[1m\x1b[32mTom\x1b[1m\x1b[32m \x1b[1m\x1b[32mthe\x1b[1m\x1b[32m \x1b[0m Player: \x1b[1m\x1b[33mGriatch\x1b[0m \x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[0m |\n| \x1b[1m\x1b[32mBouncer\x1b[0m\x1b[0m |\n| |\n >----------------------------------------------<\n| |\n| Desc: A sturdy \x1b[0m STR: 12 \x1b[0m DEX: 10 \x1b[0m |\n| fellow\x1b[0m INT: 5 \x1b[0m STA: 18 \x1b[0m |\n| LUC: 10 MAG: 3 |\n| |\n >----------------------------------------------<\n| | |\n| HP|MV |M\x1b[0m | Skill |Value |Exp \x1b[0m |\n| ~~+~~~+~ | ~~~~~~~~~~~~+~~~~~~~~~~+~~~~~~~~~~~ |\n| **|***\x1b[0m|*\x1b[0m | Shooting |12 |550/1200 \x1b[0m\x1b[0m |\n| |**\x1b[0m |*\x1b[0m | Herbalism |14 |990/1400 \x1b[0m\x1b[0m |\n| | |*\x1b[0m | Smithing |9 |205/900 \x1b[0m |\n| | |\n ------------------------------------------------\n') + def test_ansi_escape(self): # note that in a msg() call, the result would be the correct |-----, # in a print, ansi only gets called once, so ||----- is the result