-# Copyright (c) 2004-2019 mudpy authors. Permission to use, copy,
+# Copyright (c) 2004-2020 mudpy authors. Permission to use, copy,
# modify, and distribute this software is granted under terms
# provided in the LICENSE file distributed with this software.
(0, r"What would you like to do\?", "c"),
(0, "Pick a birth gender for your new avatar:", "f"),
(0, "Choose a name for her:", "1"),
- (0, "What would you like to do?", "a"),
- (0, "Whom would you like to awaken?", ""),
+ (0, r"What would you like to do\?", "a"),
+ (0, r"Whom would you like to awaken\?", ""),
)
test_account1_setup = (
(1, r"What would you like to do\?", "c"),
(1, "Pick a birth gender for your new avatar:", "m"),
(1, "Choose a name for him:", "1"),
- (1, "What would you like to do?", "a"),
- (1, "Whom would you like to awaken?", ""),
+ (1, r"What would you like to do\?", "a"),
+ (1, r"Whom would you like to awaken\?", ""),
)
test_actor_appears = (
test_escape_macros = (
(0, '> ', "say $(red)bar$(nrm)"),
- (1, r'says, "\$\(red\)bar\$\(nrm\)."', ""),
+ (1, r'says, "\$\(red\)bar\$\(nrm\)\."', ""),
)
test_movement = (
(0, r"You suddenly wonder where .* went\.", ""),
)
-test_account1_teardown = (
- (1, "What would you like to do?", "d"),
- (1, "Whom would you like to delete?", ""),
- (1, "What would you like to do?", "p"),
- (1, "permanently delete your account?", "y"),
- (1, "Disconnecting...", ""),
+test_abort_avatar_deletion = (
+ (1, r"What would you like to do\?", "d"),
+ (1, r"Whom would you like to delete\?", ""),
+ (1, r"delete an unwanted avatar.*What would you like to do\?", ""),
+)
+
+test_avatar_creation_limit = (
+ (1, r"What would you like to do\?", "c"),
+ (1, "Pick a birth gender for your new avatar:", "m"),
+ (1, "Choose a name for him:", "3"),
+ (1, r"What would you like to do\?", "c"),
+ (1, "Pick a birth gender for your new avatar:", "m"),
+ (1, "Choose a name for him:", "4"),
+ (1, r"What would you like to do\?", "c"),
+ (1, "Pick a birth gender for your new avatar:", "m"),
+ (1, "Choose a name for him:", "7"),
+ (1, r"What would you like to do\?", "c"),
+ (1, "Pick a birth gender for your new avatar:", "m"),
+ (1, "Choose a name for him:", "5"),
+ (1, r"What would you like to do\?", "c"),
+ (1, "Pick a birth gender for your new avatar:", "m"),
+ (1, "Choose a name for him:", "2"),
+ (1, r"What would you like to do\?", "c"),
+ (1, "Pick a birth gender for your new avatar:", "m"),
+ (1, "Choose a name for him:", "6"),
+ (1, r"What would you like to do\?", "c"),
+ (1, r"That is not a valid choice\.\.\.", ""),
+)
+
+test_avatar_deletion = (
+ (1, r"What would you like to do\?", "d"),
+ (1, r"Whom would you like to delete\?", "1"),
+ (1, r"create a new avatar.*What would you like to do\?", ""),
+)
+
+test_abort_account_deletion = (
+ (1, r"What would you like to do\?", "p"),
+ (1, r"permanently delete your account\?", ""),
+ (1, r"What would you like to do\?", ""),
+)
+
+test_account_deletion = (
+ (1, r"What would you like to do\?", "p"),
+ (1, r"permanently delete your account\?", "y"),
+ (1, r"Disconnecting\.\.\.", ""),
)
test_admin_setup = (
(2, r"What would you like to do\?", "c"),
(2, "Pick a birth gender for your new avatar:", "m"),
(2, "Choose a name for him:", "1"),
- (2, "What would you like to do?", "a"),
- (2, "Whom would you like to awaken?", ""),
+ (2, r"What would you like to do\?", "a"),
+ (2, r"Whom would you like to awaken\?", ""),
)
test_preferences = (
(2, r"Reloading all code modules, configs and data\."
r".* User admin reloaded the world\.",
"show element account.admin"),
- (2, 'These are the properties of the "account.admin" element.*'
+ (2, r'These are the properties of the "account\.admin" element.*'
r' \x1b\[32mpasshash:\r\n\x1b\[31m\$.*> ', ""),
)
test_show_files = (
(2, "> ", "show files"),
(2, r'These are the current files containing the universe:.*'
- r' \x1b\[31m\(rw\) \x1b\[32m/.*/account.yaml\x1b\[0m'
+ r' \x1b\[31m\(rw\) \x1b\[32m/.*/account\.yaml\x1b\[0m'
r' \x1b\[33m\[private\]\x1b\[0m.*> ', ""),
)
(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.*'
+ (2, r'These are the properties of the "actor\.avatar_admin_0" element.*'
r' \x1b\[32mgender: \x1b\[31mfemale.*> ', ""),
)
(2, r"\r\n838102050\r\n.*> ", "show result 1/0"),
(2, r"Your expression raised an exception.*division by zero.*> ",
"show result mudpy"),
- (2, r"<module 'mudpy' from .*> ", "show result re"),
+ (2, r"<module 'mudpy' from.*> ", "show result re"),
(2, r"Your expression raised an exception.*name 're' is not defined.*> ",
"show result universe"),
- (2, r"<mudpy.misc.Universe object at 0x.*> ", "show result actor"),
+ (2, r"<mudpy\.misc\.Universe object at 0x.*> ", "show result actor"),
(2, r"Your expression raised an exception.*name 'actor' is not "
r"defined.*> ", ""),
)
test_show_log = (
(2, "> ", "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:", ""),
+ r"[0-9]+\. The matching.*from [0-9]+ to [0-9]+ are:", ""),
)
test_custom_loglevel = (
(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:", ""),
+ r"[0-9]+\. The matching.*from [0-9]+ to [0-9]+ are:", ""),
)
test_invalid_loglevel = (
final_cleanup = (
(0, "> ", "quit"),
- (0, "What would you like to do?", "d"),
- (0, "Whom would you like to delete?", ""),
- (0, "What would you like to do?", "p"),
- (0, "permanently delete your account?", "y"),
- (0, "Disconnecting...", ""),
+ (0, r"What would you like to do\?", "p"),
+ (0, r"permanently delete your account\?", "y"),
+ (0, r"Disconnecting\.\.\.", ""),
(2, "> ", "quit"),
- (2, "What would you like to do?", "d"),
- (2, "Whom would you like to delete?", ""),
- (2, "What would you like to do?", "p"),
- (2, "permanently delete your account?", "y"),
- (2, "Disconnecting...", ""),
+ (2, r"What would you like to do\?", "p"),
+ (2, r"permanently delete your account\?", "y"),
+ (2, r"Disconnecting\.\.\.", ""),
)
dialogue = (
(test_escape_macros, "replacement macros are escaped"),
(test_movement, "movement"),
(test_actor_disappears, "actor spontaneous disappearance"),
- (test_account1_teardown, "second account teardown"),
+ (test_abort_avatar_deletion, "abort avatar deletion"),
+ (test_avatar_creation_limit, "avatar creation limit"),
+ (test_avatar_deletion, "avatar deletion"),
+ (test_abort_account_deletion, "abort account deletion"),
+ (test_account_deletion, "account deletion"),
(test_admin_setup, "admin account setup"),
(test_preferences, "set and show preferences"),
(test_crlf_eol, "send crlf from the client as eol"),
if len(sys.argv) > 1:
# Start the service if a config file was provided on the command line
service = start_service(sys.argv[1])
+ if not service:
+ tlog("\nERROR: Service did not start.\n")
+ sys.exit(1)
for luser in lusers:
luser.open("::1", 4000)
luser.set_option_negotiation_callback(option_callback)
projects / mudpy.git / blobdiff