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

rename Oragono to Ergo

Browse Source
This commit is contained in:
Shivaram Lingamneni
2021-05-26 23:55:21 -04:00
parent 6bdfdf58b2
commit 7be29ad801
28 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
irctest/basecontrollers.py
View File

@ -30,10 +30,10 @@ class TestCaseControllerConfig:
chathistory: bool = False
"""Whether to enable chathistory features."""
oragono_roleplay: bool = False
"""Whether to enable the Oragono role-play commands."""
ergo_roleplay: bool = False
"""Whether to enable the Ergo role-play commands."""
oragono_config: Optional[Callable[[Dict], Any]] = None
ergo_config: Optional[Callable[[Dict], Any]] = None
"""Oragono-specific configuration function that alters the dict in-place
This should be used as little as possible, using the other attributes instead;
as they are work with any controller."""

18
irctest/controllers/ergo.py
View File

@ -14,9 +14,9 @@ from irctest.cases import BaseServerTestCase
OPER_PWD = "frenchfries"
BASE_CONFIG = {
"network": {"name": "OragonoTest"},
"network": {"name": "ErgoTest"},
"server": {
"name": "oragono.test",
"name": "ergo.test",
"listeners": {},
"max-sendq": "16k",
"connection-limits": {
@ -133,8 +133,8 @@ def hash_password(password: Union[str, bytes]) -> str:
return out.decode("utf-8")
class OragonoController(BaseServerController, DirectoryBasedController):
software_name = "Oragono"
class ErgoController(BaseServerController, DirectoryBasedController):
software_name = "Ergo"
_port_wait_interval = 0.01
supported_sasl_mechanisms = {"PLAIN"}
supports_sts = True
@ -168,15 +168,15 @@ class OragonoController(BaseServerController, DirectoryBasedController):
assert self.directory
enable_chathistory = self.test_config.chathistory
enable_roleplay = self.test_config.oragono_roleplay
enable_roleplay = self.test_config.ergo_roleplay
if enable_chathistory or enable_roleplay:
config = self.addMysqlToConfig(config)
if enable_roleplay:
config["roleplay"] = {"enabled": True}
if self.test_config.oragono_config:
self.test_config.oragono_config(config)
if self.test_config.ergo_config:
self.test_config.ergo_config(config)
self.port = port
bind_address = "127.0.0.1:%s" % (port,)
@ -289,5 +289,5 @@ class OragonoController(BaseServerController, DirectoryBasedController):
self.rehash(case, config)
def get_irctest_controller_class() -> Type[OragonoController]:
return OragonoController
def get_irctest_controller_class() -> Type[ErgoController]:
return ErgoController

2
irctest/server_tests/test_bouncer.py
View File

@ -5,7 +5,7 @@ from irctest.patma import ANYSTR, StrRe
class Bouncer(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testBouncer(self):
"""Test basic bouncer functionality."""
self.controller.registerUser(self, "observer", "observerpassword")

2
irctest/server_tests/test_channel_forward.py
View File

@ -14,7 +14,7 @@ MODERN_CAPS = [
class ChannelForwarding(cases.BaseServerTestCase):
"""Test the +f channel forwarding mode."""
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testChannelForwarding(self):
self.connectClient("bar", name="bar", capabilities=MODERN_CAPS)
self.connectClient("baz", name="baz", capabilities=MODERN_CAPS)

14
irctest/server_tests/test_channel_operations.py
View File

@ -830,7 +830,7 @@ class ChannelQuitTestCase(cases.BaseServerTestCase):
class NoCTCPTestCase(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testQuit(self):
self.connectClient("bar")
self.joinChannel(1, "#chan")
@ -903,7 +903,7 @@ class KeyTestCase(cases.BaseServerTestCase):
)
if ERR_INVALIDMODEPARAM in {msg.command for msg in replies}:
# First option: ERR_INVALIDMODEPARAM (eg. Oragono)
# First option: ERR_INVALIDMODEPARAM (eg. Ergo)
return
# Second and third options: truncating the key (eg. UnrealIRCd)
@ -939,7 +939,7 @@ class KeyTestCase(cases.BaseServerTestCase):
class AuditoriumTestCase(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testAuditorium(self):
self.connectClient("bar", name="bar", capabilities=MODERN_CAPS)
self.joinChannel("bar", "#auditorium")
@ -1123,7 +1123,7 @@ class BanMode(cases.BaseServerTestCase):
self.sendLine("bar", "JOIN #chan")
self.assertMessageMatch(self.getMessage("bar"), command="JOIN")
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testCaseInsensitive(self):
"""Some clients allow unsetting modes if their argument matches
up to normalization"""
@ -1181,7 +1181,7 @@ class ModeratedMode(cases.BaseServerTestCase):
class OpModerated(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testOpModerated(self):
# test the +U channel mode
self.connectClient("chanop", name="chanop", capabilities=MODERN_CAPS)
@ -1250,7 +1250,7 @@ class MuteExtban(cases.BaseServerTestCase):
(f474e7e6dc2d36f96150ebe33b23b4ea76814415) and it is the most popular
definition so we're going with that one."""
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testISupport(self):
self.connectClient(1) # Fetches ISUPPORT
isupport = self.server_support
@ -1431,7 +1431,7 @@ class MuteExtban(cases.BaseServerTestCase):
[msg for msg in replies if msg.command == "PRIVMSG"],
)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testCapitalization(self):
"""
Regression test for oragono #1370: mutes not correctly enforced against

2
irctest/server_tests/test_channel_rename.py
View File

@ -15,7 +15,7 @@ RENAME_CAP = "draft/channel-rename"
class ChannelRename(cases.BaseServerTestCase):
"""Basic tests for channel-rename."""
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testChannelRename(self):
self.connectClient("bar", name="bar", capabilities=MODERN_CAPS + [RENAME_CAP])
self.connectClient("baz", name="baz", capabilities=MODERN_CAPS)

14
irctest/server_tests/test_chathistory.py
View File

@ -38,7 +38,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig(chathistory=True)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testInvalidTargets(self):
bar, pw = random_name("bar"), random_name("pw")
self.controller.registerUser(self, bar, pw)
@ -79,7 +79,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
params=["CHATHISTORY", "INVALID_TARGET", ANYSTR, ANYSTR],
)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testMessagesToSelf(self):
bar, pw = random_name("bar"), random_name("pw")
self.controller.registerUser(self, bar, pw)
@ -143,7 +143,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
self.assertEqual(len(set(msg.msgid for msg in echo_messages)), num_messages)
self.assertEqual(len(set(msg.time for msg in echo_messages)), num_messages)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testChathistory(self):
self.connectClient(
"bar",
@ -173,7 +173,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
self.validate_echo_messages(NUM_MESSAGES, echo_messages)
self.validate_chathistory(echo_messages, 1, chname)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testChathistoryDMs(self):
c1 = secrets.token_hex(12)
c2 = secrets.token_hex(12)
@ -483,7 +483,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
result = validate_chathistory_batch(self.getMessages(user))
self.assertIn(echo_messages[7], result)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testChathistoryTagmsg(self):
c1 = secrets.token_hex(12)
c2 = secrets.token_hex(12)
@ -577,9 +577,9 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
]
self.assertEqual(len(history_tagmsgs), 0)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testChathistoryDMClientOnlyTags(self):
# regression test for Oragono #1411
# regression test for Ergo #1411
c1 = secrets.token_hex(12)
c2 = secrets.token_hex(12)
self.controller.registerUser(self, c1, "sesame1")

4
irctest/server_tests/test_confusables.py
View File

@ -6,12 +6,12 @@ class ConfusablesTestCase(cases.BaseServerTestCase):
@staticmethod
def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig(
oragono_config=lambda config: config["accounts"].update(
ergo_config=lambda config: config["accounts"].update(
{"nick-reservation": {"enabled": True, "method": "strict"}}
)
)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testConfusableNicks(self):
self.controller.registerUser(self, "evan", "sesame")

10
irctest/server_tests/test_lusers.py
View File

@ -180,12 +180,12 @@ class LusersUnregisteredDefaultInvisibleTest(LusersUnregisteredTestCase):
@staticmethod
def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig(
oragono_config=lambda config: config["accounts"].update(
ergo_config=lambda config: config["accounts"].update(
{"default-user-modes": "+i"}
)
)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testLusers(self):
self.doLusersTest()
lusers = self.getLusers("bar")
@ -195,7 +195,7 @@ class LusersUnregisteredDefaultInvisibleTest(LusersUnregisteredTestCase):
class LuserOpersTest(LusersTestCase):
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testLuserOpers(self):
self.connectClient("bar", name="bar")
lusers = self.getLusers("bar")
@ -238,12 +238,12 @@ class OragonoInvisibleDefaultTest(LusersTestCase):
@staticmethod
def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig(
oragono_config=lambda config: config["accounts"].update(
ergo_config=lambda config: config["accounts"].update(
{"default-user-modes": "+i"}
)
)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testLusers(self):
self.connectClient("bar", name="bar")
lusers = self.getLusers("bar")

4
irctest/server_tests/test_messages.py
View File

@ -82,7 +82,7 @@ class TagsTestCase(cases.BaseServerTestCase):
class LengthLimitTestCase(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testLineAtLimit(self):
self.connectClient("bar", name="bar")
self.getMessages("bar")
@ -97,7 +97,7 @@ class LengthLimitTestCase(cases.BaseServerTestCase):
self.assertMessageMatch(result, command="PONG")
self.assertIn("x" * 450, result.params[-1])
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testLineBeyondLimit(self):
self.connectClient("bar", name="bar")
self.getMessages("bar")

4
irctest/server_tests/test_readq.py
View File

@ -4,7 +4,7 @@ from irctest import cases
class ReadqTestCase(cases.BaseServerTestCase):
"""Test responses to DoS attacks using long lines."""
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
@cases.mark_capabilities("message-tags")
def testReadqTags(self):
self.connectClient("mallory", name="mallory", capabilities=["message-tags"])
@ -12,7 +12,7 @@ class ReadqTestCase(cases.BaseServerTestCase):
self.sendLine("mallory", "PRIVMSG #test " + "a" * 16384)
self.assertDisconnected("mallory")
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testReadqNoTags(self):
self.connectClient("mallory", name="mallory")
self.joinChannel("mallory", "#test")

18
irctest/server_tests/test_register_verify.py
View File

@ -8,12 +8,12 @@ class TestRegisterBeforeConnect(cases.BaseServerTestCase):
@staticmethod
def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig(
oragono_config=lambda config: config["accounts"]["registration"].update(
ergo_config=lambda config: config["accounts"]["registration"].update(
{"allow-before-connect": True}
)
)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testBeforeConnect(self):
self.addClient("bar")
self.sendLine("bar", "CAP LS 302")
@ -31,12 +31,12 @@ class TestRegisterBeforeConnectDisallowed(cases.BaseServerTestCase):
@staticmethod
def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig(
oragono_config=lambda config: config["accounts"]["registration"].update(
ergo_config=lambda config: config["accounts"]["registration"].update(
{"allow-before-connect": False}
)
)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testBeforeConnect(self):
self.addClient("bar")
self.sendLine("bar", "CAP LS 302")
@ -57,7 +57,7 @@ class TestRegisterEmailVerified(cases.BaseServerTestCase):
@staticmethod
def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig(
oragono_config=lambda config: config["accounts"]["registration"].update(
ergo_config=lambda config: config["accounts"]["registration"].update(
{
"email-verification": {
"enabled": True,
@ -70,7 +70,7 @@ class TestRegisterEmailVerified(cases.BaseServerTestCase):
)
)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testBeforeConnect(self):
self.addClient("bar")
self.sendLine("bar", "CAP LS 302")
@ -88,7 +88,7 @@ class TestRegisterEmailVerified(cases.BaseServerTestCase):
fail_response, params=["REGISTER", "INVALID_EMAIL", ANYSTR, ANYSTR]
)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testAfterConnect(self):
self.connectClient("bar", name="bar")
self.sendLine("bar", "REGISTER * shivarampassphrase")
@ -103,12 +103,12 @@ class TestRegisterNoLandGrabs(cases.BaseServerTestCase):
@staticmethod
def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig(
oragono_config=lambda config: config["accounts"]["registration"].update(
ergo_config=lambda config: config["accounts"]["registration"].update(
{"allow-before-connect": True}
)
)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testBeforeConnect(self):
# have an anonymous client take the 'root' username:
self.connectClient("root", name="root")

2
irctest/server_tests/test_relaymsg.py
View File

@ -12,7 +12,7 @@ class RelaymsgTestCase(cases.BaseServerTestCase):
def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig(chathistory=True)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testRelaymsg(self):
self.connectClient(
"baz",

4
irctest/server_tests/test_roleplay.py
View File

@ -7,9 +7,9 @@ from irctest.patma import StrRe
class RoleplayTestCase(cases.BaseServerTestCase):
@staticmethod
def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig(oragono_roleplay=True)
return cases.TestCaseControllerConfig(ergo_roleplay=True)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testRoleplay(self):
bar = random_name("bar")
qux = random_name("qux")

2
irctest/server_tests/test_statusmsg.py
View File

@ -3,7 +3,7 @@ from irctest.numerics import RPL_NAMREPLY
class StatusmsgTestCase(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testInIsupport(self):
"""Check that the expected STATUSMSG parameter appears in our isupport list."""
self.connectClient("foo") # detects ISUPPORT

4
irctest/server_tests/test_user_commands.py
View File

@ -40,7 +40,7 @@ class WhoisTestCase(cases.BaseServerTestCase, cases.OptionalityHelper):
)
self.assertEqual(whois_user.params[5], realname)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testInvisibleWhois(self):
"""Test interaction between MODE +i and RPL_WHOISCHANNELS."""
self.connectClient("userOne")
@ -167,7 +167,7 @@ class AwayTestCase(cases.BaseServerTestCase):
class TestNoCTCPMode(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testNoCTCPMode(self):
self.connectClient("bar", "bar")
self.connectClient("qux", "qux")

2
irctest/server_tests/test_utf8.py
View File

@ -3,7 +3,7 @@ from irctest.patma import ANYSTR
class Utf8TestCase(cases.BaseServerTestCase, cases.OptionalityHelper):
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testUtf8Validation(self):
self.connectClient(
"bar",

2
irctest/server_tests/test_znc_playback.py
View File

@ -18,7 +18,7 @@ class ZncPlaybackTestCase(cases.BaseServerTestCase):
def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig(chathistory=True)
@cases.mark_specifications("Oragono")
@cases.mark_specifications("Ergo")
def testZncPlayback(self):
early_time = int(time.time() - 60)

2
irctest/specifications.py
View File

@ -8,7 +8,7 @@ class Specifications(enum.Enum):
RFC1459 = "RFC1459"
RFC2812 = "RFC2812"
IRCv3 = "IRCv3" # Mark with capabilities whenever possible
Oragono = "Oragono"
Ergo = "Ergo"
Ircdocs = "ircdocs"
"""Any document on ircdocs.horse (especially defs.ircdocs.horse),