From bc6ec0edce76c01c3d99546ee0e38bae15e75cf6 Mon Sep 17 00:00:00 2001 From: Val Lorentz Date: Fri, 19 Apr 2024 16:59:52 +0200 Subject: [PATCH] Enable WHO mask tests on Sable --- irctest/controllers/sable.py | 2 +- irctest/server_tests/who.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/irctest/controllers/sable.py b/irctest/controllers/sable.py index 786e1b9..1bc2718 100644 --- a/irctest/controllers/sable.py +++ b/irctest/controllers/sable.py @@ -378,7 +378,7 @@ class SableController(BaseServerController, DirectoryBasedController): .strip(), services_management_hostname=services_management_hostname, services_management_port=services_management_port, - services_alias_users=SERVICES_ALIAS_USERS if run_services else "" + services_alias_users=SERVICES_ALIAS_USERS if run_services else "", ) with self.open_file("configs/network.conf") as fd: diff --git a/irctest/server_tests/who.py b/irctest/server_tests/who.py index 5ee4ac3..8d96933 100644 --- a/irctest/server_tests/who.py +++ b/irctest/server_tests/who.py @@ -87,7 +87,7 @@ class BaseWhoTestCase: class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase): @cases.mark_specifications("Modern") def testWhoStar(self): - if self.controller.software_name in ("Bahamut", "Sable"): + if self.controller.software_name in ("Bahamut",): raise runner.OptionalExtensionNotSupported("WHO mask") self._init() @@ -118,7 +118,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase): ) @cases.mark_specifications("Modern") def testWhoNick(self, mask): - if "*" in mask and self.controller.software_name in ("Bahamut", "Sable"): + if "*" in mask and self.controller.software_name in ("Bahamut",): raise runner.OptionalExtensionNotSupported("WHO mask") self._init() @@ -148,7 +148,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase): ids=["username", "realname-mask", "hostname"], ) def testWhoUsernameRealName(self, mask): - if "*" in mask and self.controller.software_name in ("Bahamut", "Sable"): + if "*" in mask and self.controller.software_name in ("Bahamut",): raise runner.OptionalExtensionNotSupported("WHO mask") self._init() @@ -201,7 +201,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase): ) @cases.mark_specifications("Modern") def testWhoNickAway(self, mask): - if "*" in mask and self.controller.software_name in ("Bahamut", "Sable"): + if "*" in mask and self.controller.software_name in ("Bahamut",): raise runner.OptionalExtensionNotSupported("WHO mask") self._init() @@ -235,7 +235,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase): ) @cases.mark_specifications("Modern") def testWhoNickOper(self, mask): - if "*" in mask and self.controller.software_name in ("Bahamut", "Sable"): + if "*" in mask and self.controller.software_name in ("Bahamut",): raise runner.OptionalExtensionNotSupported("WHO mask") self._init() @@ -274,7 +274,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase): ) @cases.mark_specifications("Modern") def testWhoNickAwayAndOper(self, mask): - if "*" in mask and self.controller.software_name in ("Bahamut", "Sable"): + if "*" in mask and self.controller.software_name in ("Bahamut",): raise runner.OptionalExtensionNotSupported("WHO mask") self._init() @@ -308,7 +308,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase): @pytest.mark.parametrize("mask", ["#chan", "#CHAN"], ids=["exact", "casefolded"]) @cases.mark_specifications("Modern") def testWhoChan(self, mask): - if "*" in mask and self.controller.software_name in ("Bahamut", "Sable"): + if "*" in mask and self.controller.software_name in ("Bahamut",): raise runner.OptionalExtensionNotSupported("WHO mask") self._init() @@ -632,7 +632,7 @@ class WhoServicesTestCase(BaseWhoTestCase, cases.BaseServerTestCase): class WhoInvisibleTestCase(cases.BaseServerTestCase): @cases.mark_specifications("Modern") def testWhoInvisible(self): - if self.controller.software_name in ("Bahamut", "Sable"): + if self.controller.software_name in ("Bahamut",): raise runner.OptionalExtensionNotSupported("WHO mask") self.connectClient("evan", name="evan")