Switch actors to new-style elements

[mudpy.git] / mudpy / tests / selftest.py

diff --git a/mudpy/tests/selftest.py b/mudpy/tests/selftest.py
index a7fefc2..5adc43c 100644 (file)
--- a/mudpy/tests/selftest.py
+++ b/mudpy/tests/selftest.py
@@ -162,7 +162,7 @@ test_reload = (
 )
 
 test_set_facet = (
-    (2, "> ", "set actor:avatar:admin:0 gender female"),
+    (2, "> ", "set actor.avatar_admin_0 gender female"),
     (2, r'You have successfully \(re\)set the "gender" facet of element', ""),
 )
 
@@ -188,8 +188,8 @@ test_show_element = (
     (2, "> ", "show element mudpy.limit"),
     (2, r'These are the properties of the "mudpy\.limit" element.*'
         r'  \x1b\[32mpassword_tries: \x1b\[31m3.*> ',
-     "show element actor:avatar:admin:0"),
-    (2, r'These are the properties of the "actor:avatar:admin:0" element.*'
+     "show element actor.avatar_admin_0"),
+    (2, r'These are the properties of the "actor.avatar_admin_0" element.*'
         r'  \x1b\[32mgender: \x1b\[31mfemale.*> ', ""),
 )
 
@@ -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 "<class 'str'>" cannot be coerced .*> ''', ""),
 )
 
@@ -256,13 +256,25 @@ 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 ConnectionResetError:
+                print("ERROR: Unable to connect to server.")
+                success = False
+                break
+            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")
-            except:
+            except Exception:
                 pass
             if index is not 0:
                 print("ERROR: luser%s did not receive expected string:\n\n"
@@ -283,7 +295,7 @@ def main():
         try:
             captures[conversant] += lusers[
                 conversant].read_very_eager().decode("utf-8")
-        except:
+        except Exception:
             pass
         lusers[conversant].close()
         logfile = "capture_%s.log" % conversant