diff --git a/Makefile b/Makefile index a0bdd3c..6ac24d6 100644 --- a/Makefile +++ b/Makefile @@ -112,8 +112,8 @@ SOPEL_SELECTORS := \ $(EXTRA_SELECTORS) # testNoticeNonexistentChannel fails: https://bugs.unrealircd.org/view.php?id=5949 -# test_regressions::testTagCap fails: https://bugs.unrealircd.org/view.php?id=5948 -# test_messages::testLineTooLong fails: https://bugs.unrealircd.org/view.php?id=5947 +# regressions::testTagCap fails: https://bugs.unrealircd.org/view.php?id=5948 +# messages::testLineTooLong fails: https://bugs.unrealircd.org/view.php?id=5947 # testCapRemovalByClient and testNakWhole fail pending https://github.com/unrealircd/unrealircd/pull/148 # Tests marked with arbitrary_client_tags can't pass because Unreal whitelists which tags it relays # Tests marked with react_tag can't pass because Unreal blocks +draft/react https://github.com/unrealircd/unrealircd/pull/149 @@ -125,10 +125,10 @@ UNREALIRCD_SELECTORS := \ and not deprecated \ and not strict \ and not testNoticeNonexistentChannel \ - and not (test_regressions and testTagCap) \ - and not (test_messages and testLineTooLong) \ - and not (test_cap and (testCapRemovalByClient or testNakWhole)) \ - and not (test_account_tag and testInvite) \ + and not (regressions.py and testTagCap) \ + and not (messages.py and testLineTooLong) \ + and not (cap.py and (testCapRemovalByClient or testNakWhole)) \ + and not (account_tag.py and testInvite) \ and not arbitrary_client_tags \ and not react_tag \ and not private_chathistory \ diff --git a/irctest/client_tests/test_cap.py b/irctest/client_tests/cap.py similarity index 100% rename from irctest/client_tests/test_cap.py rename to irctest/client_tests/cap.py diff --git a/irctest/client_tests/test_sasl.py b/irctest/client_tests/sasl.py similarity index 100% rename from irctest/client_tests/test_sasl.py rename to irctest/client_tests/sasl.py diff --git a/irctest/client_tests/test_tls.py b/irctest/client_tests/tls.py similarity index 100% rename from irctest/client_tests/test_tls.py rename to irctest/client_tests/tls.py diff --git a/irctest/self_tests/test_cases.py b/irctest/self_tests/cases.py similarity index 100% rename from irctest/self_tests/test_cases.py rename to irctest/self_tests/cases.py diff --git a/irctest/server_tests/test_account_tag.py b/irctest/server_tests/account_tag.py similarity index 100% rename from irctest/server_tests/test_account_tag.py rename to irctest/server_tests/account_tag.py diff --git a/irctest/server_tests/test_away_notify.py b/irctest/server_tests/away_notify.py similarity index 100% rename from irctest/server_tests/test_away_notify.py rename to irctest/server_tests/away_notify.py diff --git a/irctest/server_tests/test_bot_mode.py b/irctest/server_tests/bot_mode.py similarity index 100% rename from irctest/server_tests/test_bot_mode.py rename to irctest/server_tests/bot_mode.py diff --git a/irctest/server_tests/test_bouncer.py b/irctest/server_tests/bouncer.py similarity index 100% rename from irctest/server_tests/test_bouncer.py rename to irctest/server_tests/bouncer.py diff --git a/irctest/server_tests/test_buffering.py b/irctest/server_tests/buffering.py similarity index 100% rename from irctest/server_tests/test_buffering.py rename to irctest/server_tests/buffering.py diff --git a/irctest/server_tests/test_cap.py b/irctest/server_tests/cap.py similarity index 100% rename from irctest/server_tests/test_cap.py rename to irctest/server_tests/cap.py diff --git a/irctest/server_tests/test_channel_forward.py b/irctest/server_tests/channel_forward.py similarity index 100% rename from irctest/server_tests/test_channel_forward.py rename to irctest/server_tests/channel_forward.py diff --git a/irctest/server_tests/test_channel_operations.py b/irctest/server_tests/channel_operations.py similarity index 100% rename from irctest/server_tests/test_channel_operations.py rename to irctest/server_tests/channel_operations.py diff --git a/irctest/server_tests/test_channel_rename.py b/irctest/server_tests/channel_rename.py similarity index 100% rename from irctest/server_tests/test_channel_rename.py rename to irctest/server_tests/channel_rename.py diff --git a/irctest/server_tests/test_chathistory.py b/irctest/server_tests/chathistory.py similarity index 100% rename from irctest/server_tests/test_chathistory.py rename to irctest/server_tests/chathistory.py diff --git a/irctest/server_tests/test_confusables.py b/irctest/server_tests/confusables.py similarity index 100% rename from irctest/server_tests/test_confusables.py rename to irctest/server_tests/confusables.py diff --git a/irctest/server_tests/test_connection_registration.py b/irctest/server_tests/connection_registration.py similarity index 100% rename from irctest/server_tests/test_connection_registration.py rename to irctest/server_tests/connection_registration.py diff --git a/irctest/server_tests/test_echo_message.py b/irctest/server_tests/echo_message.py similarity index 100% rename from irctest/server_tests/test_echo_message.py rename to irctest/server_tests/echo_message.py diff --git a/irctest/server_tests/test_extended_join.py b/irctest/server_tests/extended_join.py similarity index 100% rename from irctest/server_tests/test_extended_join.py rename to irctest/server_tests/extended_join.py diff --git a/irctest/server_tests/test_labeled_responses.py b/irctest/server_tests/labeled_responses.py similarity index 100% rename from irctest/server_tests/test_labeled_responses.py rename to irctest/server_tests/labeled_responses.py diff --git a/irctest/server_tests/test_lusers.py b/irctest/server_tests/lusers.py similarity index 100% rename from irctest/server_tests/test_lusers.py rename to irctest/server_tests/lusers.py diff --git a/irctest/server_tests/test_message_tags.py b/irctest/server_tests/message_tags.py similarity index 100% rename from irctest/server_tests/test_message_tags.py rename to irctest/server_tests/message_tags.py diff --git a/irctest/server_tests/test_messages.py b/irctest/server_tests/messages.py similarity index 100% rename from irctest/server_tests/test_messages.py rename to irctest/server_tests/messages.py diff --git a/irctest/server_tests/test_metadata.py b/irctest/server_tests/metadata.py similarity index 100% rename from irctest/server_tests/test_metadata.py rename to irctest/server_tests/metadata.py diff --git a/irctest/server_tests/test_monitor.py b/irctest/server_tests/monitor.py similarity index 100% rename from irctest/server_tests/test_monitor.py rename to irctest/server_tests/monitor.py diff --git a/irctest/server_tests/test_multi_prefix.py b/irctest/server_tests/multi_prefix.py similarity index 100% rename from irctest/server_tests/test_multi_prefix.py rename to irctest/server_tests/multi_prefix.py diff --git a/irctest/server_tests/test_multiline.py b/irctest/server_tests/multiline.py similarity index 100% rename from irctest/server_tests/test_multiline.py rename to irctest/server_tests/multiline.py diff --git a/irctest/server_tests/test_readq.py b/irctest/server_tests/readq.py similarity index 100% rename from irctest/server_tests/test_readq.py rename to irctest/server_tests/readq.py diff --git a/irctest/server_tests/test_register_verify.py b/irctest/server_tests/register_verify.py similarity index 100% rename from irctest/server_tests/test_register_verify.py rename to irctest/server_tests/register_verify.py diff --git a/irctest/server_tests/test_regressions.py b/irctest/server_tests/regressions.py similarity index 100% rename from irctest/server_tests/test_regressions.py rename to irctest/server_tests/regressions.py diff --git a/irctest/server_tests/test_relaymsg.py b/irctest/server_tests/relaymsg.py similarity index 98% rename from irctest/server_tests/test_relaymsg.py rename to irctest/server_tests/relaymsg.py index 654d58a..07df252 100644 --- a/irctest/server_tests/test_relaymsg.py +++ b/irctest/server_tests/relaymsg.py @@ -1,7 +1,7 @@ from irctest import cases from irctest.irc_utils.junkdrawer import random_name from irctest.patma import ANYSTR -from irctest.server_tests.test_chathistory import CHATHISTORY_CAP, EVENT_PLAYBACK_CAP +from irctest.server_tests.chathistory import CHATHISTORY_CAP, EVENT_PLAYBACK_CAP RELAYMSG_CAP = "draft/relaymsg" RELAYMSG_TAG_NAME = "draft/relaymsg" diff --git a/irctest/server_tests/test_roleplay.py b/irctest/server_tests/roleplay.py similarity index 100% rename from irctest/server_tests/test_roleplay.py rename to irctest/server_tests/roleplay.py diff --git a/irctest/server_tests/test_sasl.py b/irctest/server_tests/sasl.py similarity index 100% rename from irctest/server_tests/test_sasl.py rename to irctest/server_tests/sasl.py diff --git a/irctest/server_tests/test_statusmsg.py b/irctest/server_tests/statusmsg.py similarity index 100% rename from irctest/server_tests/test_statusmsg.py rename to irctest/server_tests/statusmsg.py diff --git a/irctest/server_tests/test_user_commands.py b/irctest/server_tests/user_commands.py similarity index 100% rename from irctest/server_tests/test_user_commands.py rename to irctest/server_tests/user_commands.py diff --git a/irctest/server_tests/test_utf8.py b/irctest/server_tests/utf8.py similarity index 100% rename from irctest/server_tests/test_utf8.py rename to irctest/server_tests/utf8.py diff --git a/irctest/server_tests/test_znc_playback.py b/irctest/server_tests/znc_playback.py similarity index 100% rename from irctest/server_tests/test_znc_playback.py rename to irctest/server_tests/znc_playback.py diff --git a/pytest.ini b/pytest.ini index a715143..1dca41c 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,4 +1,5 @@ [pytest] +python_files = *_tests/*.py markers = # specifications RFC1459