X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2Ftests%2Fselftest.py;h=500356f9b543cabfb4bd12ef63d97539294b910e;hp=a7fefc27b27b8fe6e855f52fe888384f446f9a2c;hb=3a23edd7aa2a33c47ce9d4ff0167d80bee26b300;hpb=347ddf4408c384adc4ac9a449595405c2b2fce47 diff --git a/mudpy/tests/selftest.py b/mudpy/tests/selftest.py index a7fefc2..500356f 100644 --- a/mudpy/tests/selftest.py +++ b/mudpy/tests/selftest.py @@ -200,14 +200,14 @@ test_show_log = ( ) test_custom_loglevel = ( - (2, "> ", "set account:admin loglevel 2"), + (2, "> ", "set account.admin loglevel 2"), (2, "You have successfully .*> ", "show log"), (2, r"There are [0-9]+ log lines in memory and [0-9]+ at or above level " r"[0-9]+\. The matching lines\r\nfrom [0-9]+ to [0-9]+ are:", ""), ) test_invalid_loglevel = ( - (2, "> ", "set account:admin loglevel two"), + (2, "> ", "set account.admin loglevel two"), (2, r'''Value "two" of type "" cannot be coerced .*> ''', ""), ) @@ -256,9 +256,17 @@ def main(): test_start = time.time() for conversant, question, answer in test: print("luser%s waiting for: %s" % (conversant, question)) - index, match, received = lusers[conversant].expect( - [re.compile(question.encode("utf-8"), flags=re.DOTALL)], 5) - captures[conversant] += received.decode("utf-8") + try: + index, match, received = lusers[conversant].expect( + [re.compile(question.encode("utf-8"), flags=re.DOTALL)], 5) + captures[conversant] += received.decode("utf-8") + except EOFError: + print("ERROR: luser%s premature disconnection expecting:\n\n" + "%s\n\n" + "Check the end of capture_%s.log for received data." + % (conversant, question, conversant)) + success = False + break try: captures[conversant] += lusers[ conversant].read_very_eager().decode("utf-8")