val/irctest
1
0
Fork 0
mirror of https://github.com/progval/irctest.git synced 2025-04-05 06:49:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use -m instead of -k to filter markers

Browse Source 
-k uses substring match, so -k Sable matched ErgoUtf8NickDisabledTestCase
This commit is contained in:
Val Lorentz
2024-12-08 13:25:59 +01:00
parent e0b4aec24a
commit 4cfb7665c6
1 changed files with 112 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
Makefile
View File

@ -4,110 +4,159 @@ PYTEST ?= python3 -m pytest
# pytest-xdist is installed) # pytest-xdist is installed)
PYTEST_ARGS ?= PYTEST_ARGS ?=
# Will be appended at the end of the -m argument to pytest
EXTRA_MARKERS ?=
# Will be appended at the end of the -k argument to pytest # Will be appended at the end of the -k argument to pytest
EXTRA_SELECTORS ?= EXTRA_SELECTORS ?=
BAHAMUT_SELECTORS := \ BAHAMUT_MARKERS := \
not implementation-specific \ not implementation-specific \
and not deprecated \ and not deprecated \
and not strict \ and not strict \
and not IRCv3 \ and not IRCv3 \
$(EXTRA_MARKERS)
BAHAMUT_SELECTORS := \
(foo or not foo) \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
CHARYBDIS_SELECTORS := \ CHARYBDIS_MARKERS := \
not implementation-specific \ not implementation-specific \
and not deprecated \ and not deprecated \
and not strict \ and not strict \
$(EXTRA_MARKERS)
CHARYBDIS_SELECTORS := \
(foo or not foo) \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
ERGO_SELECTORS := \ ERGO_MARKERS := \
(Ergo or not implementation-specific) \ (Ergo or not implementation-specific) \
and not deprecated \ and not deprecated \
$(EXTRA_MARKERS)
ERGO_SELECTORS := \
(foo or not foo) \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
HYBRID_MARKERS := \
not implementation-specific \
and not deprecated \
$(EXTRA_MARKERS)
HYBRID_SELECTORS := \ HYBRID_SELECTORS := \
not implementation-specific \ (foo or not foo) \
and not deprecated \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
INSPIRCD_MARKERS := \
not implementation-specific \
and not deprecated \
and not strict \
$(EXTRA_MARKERS)
INSPIRCD_SELECTORS := \ INSPIRCD_SELECTORS := \
(foo or not foo) \
$(EXTRA_SELECTORS)
IRCU2_MARKERS := \
not implementation-specific \ not implementation-specific \
and not deprecated \ and not deprecated \
and not strict \ and not strict \
$(EXTRA_SELECTORS) and not IRCv3 \
$(EXTRA_MARKERS)
IRCU2_SELECTORS := \ IRCU2_SELECTORS := \
(foo or not foo) \
$(EXTRA_SELECTORS)
NEFARIOUS_MARKERS := \
not implementation-specific \ not implementation-specific \
and not deprecated \ and not deprecated \
and not strict \ and not strict \
$(EXTRA_SELECTORS) $(EXTRA_MARKERS)
NEFARIOUS_SELECTORS := \ NEFARIOUS_SELECTORS := \
(foo or not foo) \
$(EXTRA_SELECTORS)
SNIRCD_MARKERS := \
not implementation-specific \ not implementation-specific \
and not deprecated \ and not deprecated \
and not strict \ and not strict \
$(EXTRA_SELECTORS) and not IRCv3 \
$(EXTRA_MARKERS)
SNIRCD_SELECTORS := \ SNIRCD_SELECTORS := \
(foo or not foo) \
$(EXTRA_SELECTORS)
IRC2_MARKERS := \
not implementation-specific \ not implementation-specific \
and not deprecated \ and not deprecated \
and not strict \ and not strict \
$(EXTRA_SELECTORS) and not IRCv3 \
$(EXTRA_MARKERS)
IRC2_SELECTORS := \ IRC2_SELECTORS := \
(foo or not foo) \
$(EXTRA_SELECTORS)
MAMMON_MARKERS := \
not implementation-specific \ not implementation-specific \
and not deprecated \ and not deprecated \
and not strict \ and not strict \
$(EXTRA_SELECTORS) $(EXTRA_MARKERS)
MAMMON_SELECTORS := \ MAMMON_SELECTORS := \
(foo or not foo) \
$(EXTRA_SELECTORS)
NGIRCD_MARKERS := \
not implementation-specific \ not implementation-specific \
and not deprecated \ and not deprecated \
and not strict \ and not strict \
$(EXTRA_SELECTORS) $(EXTRA_MARKERS)
NGIRCD_SELECTORS := \ NGIRCD_SELECTORS := \
not implementation-specific \ (foo or not foo) \
and not deprecated \
and not strict \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
PLEXUS4_MARKERS := \
not implementation-specific \
and not deprecated \
$(EXTRA_MARKERS)
PLEXUS4_SELECTORS := \ PLEXUS4_SELECTORS := \
not implementation-specific \ (foo or not foo) \
and not deprecated \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
# Limnoria can actually pass all the test so there is none to exclude. LIMNORIA_MARKERS := \
# `(foo or not foo)` serves as a `true` value so it doesn't break when not implementation-specific \
# $(EXTRA_SELECTORS) is non-empty $(EXTRA_MARKERS)
LIMNORIA_SELECTORS := \ LIMNORIA_SELECTORS := \
(foo or not foo) \ (foo or not foo) \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
# Tests marked with arbitrary_client_tags or react_tag can't pass because Sable does not support client tags yet # Tests marked with arbitrary_client_tags or react_tag can't pass because Sable does not support client tags yet
SABLE_SELECTORS := \ SABLE_MARKERS := \
(Sable or not implementation-specific) \ (Sable or not implementation-specific) \
and not deprecated \ and not deprecated \
and not strict \ and not strict \
and not arbitrary_client_tags \ and not arbitrary_client_tags \
and not react_tag \ and not react_tag \
and not list and not lusers and not time and not info \ $(EXTRA_MARKERS)
SABLE_SELECTORS := \
not list and not lusers and not time and not info \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
SOLANUM_SELECTORS := \ SOLANUM_MARKERS := \
not implementation-specific \ not implementation-specific \
and not deprecated \ and not deprecated \
and not strict \ and not strict \
$(EXTRA_MARKERS)
SOLANUM_SELECTORS := \
(foo or not foo) \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
# Same as Limnoria SOPEL_MARKERS := \
not implementation-specific \
$(EXTRA_MARKERS)
SOPEL_SELECTORS := \ SOPEL_SELECTORS := \
(foo or not foo) \ (foo or not foo) \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
# TheLounge can actually pass all the test so there is none to exclude. THELOUNGE_MARKERS := \
# `(foo or not foo)` serves as a `true` value so it doesn't break when not implementation-specific \
# $(EXTRA_SELECTORS) is non-empty $(EXTRA_MARKERS)
THELOUNGE_SELECTORS := \ THELOUNGE_SELECTORS := \
(foo or not foo) \ (foo or not foo) \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
@ -116,13 +165,16 @@ THELOUNGE_SELECTORS := \
# Tests marked with react_tag can't pass because Unreal blocks +draft/react https://github.com/unrealircd/unrealircd/pull/149 # Tests marked with react_tag can't pass because Unreal blocks +draft/react https://github.com/unrealircd/unrealircd/pull/149
# Tests marked with private_chathistory can't pass because Unreal does not implement CHATHISTORY for DMs # Tests marked with private_chathistory can't pass because Unreal does not implement CHATHISTORY for DMs
UNREALIRCD_SELECTORS := \ UNREALIRCD_MARKERS := \
not implementation-specific \ not implementation-specific \
and not deprecated \ and not deprecated \
and not strict \ and not strict \
and not arbitrary_client_tags \ and not arbitrary_client_tags \
and not react_tag \ and not react_tag \
and not private_chathistory \ and not private_chathistory \
$(EXTRA_MARKERS)
UNREALIRCD_SELECTORS := \
(foo or not foo) \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
.PHONY: all flakes bahamut charybdis ergo inspircd ircu2 snircd irc2 mammon nefarious limnoria sable sopel solanum unrealircd .PHONY: all flakes bahamut charybdis ergo inspircd ircu2 snircd irc2 mammon nefarious limnoria sable sopel solanum unrealircd
@ -138,107 +190,114 @@ bahamut:
-m 'not services' \ -m 'not services' \
-n 4 \ -n 4 \
-vv -s \ -vv -s \
-m 'not services and $(BAHAMUT_MARKERS)'
-k '$(BAHAMUT_SELECTORS)' -k '$(BAHAMUT_SELECTORS)'
bahamut-atheme: bahamut-atheme:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.bahamut \ --controller=irctest.controllers.bahamut \
--services-controller=irctest.controllers.atheme_services \ --services-controller=irctest.controllers.atheme_services \
-m 'services' \ -m 'services and $(BAHAMUT_MARKERS)' \
-k '$(BAHAMUT_SELECTORS)' -k '$(BAHAMUT_SELECTORS)'
bahamut-anope: bahamut-anope:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.bahamut \ --controller=irctest.controllers.bahamut \
--services-controller=irctest.controllers.anope_services \ --services-controller=irctest.controllers.anope_services \
-m 'services' \ -m 'services and $(BAHAMUT_MARKERS)' \
-k '$(BAHAMUT_SELECTORS)' -k '$(BAHAMUT_SELECTORS)'
charybdis: charybdis:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.charybdis \ --controller=irctest.controllers.charybdis \
--services-controller=irctest.controllers.atheme_services \ --services-controller=irctest.controllers.atheme_services \
-m '$(CHARYBDIS_MARKERS)'
-k '$(CHARYBDIS_SELECTORS)' -k '$(CHARYBDIS_SELECTORS)'
ergo: ergo:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller irctest.controllers.ergo \ --controller irctest.controllers.ergo \
-m '$(ERGO_MARKERS)'
-k "$(ERGO_SELECTORS)" -k "$(ERGO_SELECTORS)"
hybrid: hybrid:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller irctest.controllers.hybrid \ --controller irctest.controllers.hybrid \
--services-controller=irctest.controllers.anope_services \ --services-controller=irctest.controllers.anope_services \
-m '$(HYBRID_MARKERS)'
-k "$(HYBRID_SELECTORS)" -k "$(HYBRID_SELECTORS)"
inspircd: inspircd:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.inspircd \ --controller=irctest.controllers.inspircd \
-m 'not services' \ -m 'not services and $(INSPIRCD_MARKERS)' \
-k '$(INSPIRCD_SELECTORS)' -k '$(INSPIRCD_SELECTORS)'
inspircd-atheme: inspircd-atheme:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.inspircd \ --controller=irctest.controllers.inspircd \
--services-controller=irctest.controllers.atheme_services \ --services-controller=irctest.controllers.atheme_services \
-m 'services' \ -m 'services and $(INSPIRCD_MARKERS)' \
-k '$(INSPIRCD_SELECTORS)' -k '$(INSPIRCD_SELECTORS)'
inspircd-anope: inspircd-anope:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.inspircd \ --controller=irctest.controllers.inspircd \
--services-controller=irctest.controllers.anope_services \ --services-controller=irctest.controllers.anope_services \
-m 'services' \ -m 'services and $(INSPIRCD_MARKERS)' \
-k '$(INSPIRCD_SELECTORS)' -k '$(INSPIRCD_SELECTORS)'
ircu2: ircu2:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.ircu2 \ --controller=irctest.controllers.ircu2 \
-m 'not services and not IRCv3' \ -m 'not services and $(IRCU2_MARKERS)' \
-n 4 \ -n 4 \
-k '$(IRCU2_SELECTORS)' -k '$(IRCU2_SELECTORS)'
nefarious: nefarious:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.nefarious \ --controller=irctest.controllers.nefarious \
-m 'not services' \ -m 'not services and $(NEFARIOUS_MARKERS)' \
-n 4 \ -n 4 \
-k '$(NEFARIOUS_SELECTORS)' -k '$(NEFARIOUS_SELECTORS)'
snircd: snircd:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.snircd \ --controller=irctest.controllers.snircd \
-m 'not services and not IRCv3' \ -m 'not services and $(SNIRCD_MARKERS)' \
-n 4 \ -n 4 \
-k '$(SNIRCD_SELECTORS)' -k '$(SNIRCD_SELECTORS)'
irc2: irc2:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.irc2 \ --controller=irctest.controllers.irc2 \
-m 'not services and not IRCv3' \ -m 'not services and $(IRCU2_MARKERS)' \
-n 4 \ -n 4 \
-k '$(IRC2_SELECTORS)' -k '$(IRC2_SELECTORS)'
limnoria: limnoria:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.limnoria \ --controller=irctest.controllers.limnoria \
-m '$(LIMNORIA_MARKERS)' \
-k '$(LIMNORIA_SELECTORS)' -k '$(LIMNORIA_SELECTORS)'
mammon: mammon:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.mammon \ --controller=irctest.controllers.mammon \
-m '$(MAMMON_MARKERS)' \
-k '$(MAMMON_SELECTORS)' -k '$(MAMMON_SELECTORS)'
plexus4: plexus4:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller irctest.controllers.plexus4 \ --controller irctest.controllers.plexus4 \
--services-controller=irctest.controllers.anope_services \ --services-controller=irctest.controllers.anope_services \
-m '$(PLEXUS4_MARKERS)' \
-k "$(PLEXUS4_SELECTORS)" -k "$(PLEXUS4_SELECTORS)"
ngircd: ngircd:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller irctest.controllers.ngircd \ --controller irctest.controllers.ngircd \
-m 'not services' \ -m 'not services and $(NGIRCD_MARKERS)' \
-n 4 \ -n 4 \
-k "$(NGIRCD_SELECTORS)" -k "$(NGIRCD_SELECTORS)"
@ -246,19 +305,20 @@ ngircd-anope:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller irctest.controllers.ngircd \ --controller irctest.controllers.ngircd \
--services-controller=irctest.controllers.anope_services \ --services-controller=irctest.controllers.anope_services \
-m 'services' \ -m 'services and $(NGIRCD_MARKERS)' \
-k "$(NGIRCD_SELECTORS)" -k "$(NGIRCD_SELECTORS)"
ngircd-atheme: ngircd-atheme:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller irctest.controllers.ngircd \ --controller irctest.controllers.ngircd \
--services-controller=irctest.controllers.atheme_services \ --services-controller=irctest.controllers.atheme_services \
-m 'services' \ -m 'services and $(NGIRCD_MARKERS)' \
-k "$(NGIRCD_SELECTORS)" -k "$(NGIRCD_SELECTORS)"
sable: sable:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.sable \ --controller=irctest.controllers.sable \
-m '$(SABLE_MARKERS)' \
-n 20 \ -n 20 \
-k '$(SABLE_SELECTORS)' -k '$(SABLE_SELECTORS)'
@ -266,22 +326,25 @@ solanum:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.solanum \ --controller=irctest.controllers.solanum \
--services-controller=irctest.controllers.atheme_services \ --services-controller=irctest.controllers.atheme_services \
-m '$(SOLANUM_MARKERS)' \
-k '$(SOLANUM_SELECTORS)' -k '$(SOLANUM_SELECTORS)'
sopel: sopel:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.sopel \ --controller=irctest.controllers.sopel \
-m '$(SOPEL_MARKERS)' \
-k '$(SOPEL_SELECTORS)' -k '$(SOPEL_SELECTORS)'
thelounge: thelounge:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.thelounge \ --controller=irctest.controllers.thelounge \
-m '$(THELOUNGE_MARKERS)' \
-k '$(THELOUNGE_SELECTORS)' -k '$(THELOUNGE_SELECTORS)'
unrealircd: unrealircd:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.unrealircd \ --controller=irctest.controllers.unrealircd \
-m 'not services' \ -m 'not services and $(UNREALIRCD_MARKERS)' \
-k '$(UNREALIRCD_SELECTORS)' -k '$(UNREALIRCD_SELECTORS)'
unrealircd-5: unrealircd unrealircd-5: unrealircd
@ -290,19 +353,19 @@ unrealircd-atheme:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.unrealircd \ --controller=irctest.controllers.unrealircd \
--services-controller=irctest.controllers.atheme_services \ --services-controller=irctest.controllers.atheme_services \
-m 'services' \ -m 'services and $(UNREALIRCD_MARKERS)' \
-k '$(UNREALIRCD_SELECTORS)' -k '$(UNREALIRCD_SELECTORS)'
unrealircd-anope: unrealircd-anope:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.unrealircd \ --controller=irctest.controllers.unrealircd \
--services-controller=irctest.controllers.anope_services \ --services-controller=irctest.controllers.anope_services \
-m 'services' \ -m 'services and $(UNREALIRCD_MARKERS)' \
-k '$(UNREALIRCD_SELECTORS)' -k '$(UNREALIRCD_SELECTORS)'
unrealircd-dlk: unrealircd-dlk:
pifpaf run mysql -- $(PYTEST) $(PYTEST_ARGS) \ pifpaf run mysql -- $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.unrealircd \ --controller=irctest.controllers.unrealircd \
--services-controller=irctest.controllers.dlk_services \ --services-controller=irctest.controllers.dlk_services \
-m 'services' \ -m 'services and $(UNREALIRCD_MARKERS)' \
-k '$(UNREALIRCD_SELECTORS)' -k '$(UNREALIRCD_SELECTORS)'