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

Merge pull request #54 from ergochat/ergo

Browse Source 
rename Oragono to Ergo
This commit is contained in:
Shivaram Lingamneni
2021-05-28 17:38:56 -04:00
committed by GitHub
parent db0c64fa30 c3b7663e06
commit a7d7436929
28 changed files with 95 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/charybdis.yml vendored
View File

@ -49,5 +49,5 @@ jobs:
- name: Test with pytest - name: Test with pytest
run: | run: |
# testQuitErrors is very flaky # testQuitErrors is very flaky
PATH=~/.local/bin:$PATH pytest --controller=irctest.controllers.charybdis -k 'not Oragono and not deprecated and not strict and not testDoubleKickMessages and not testQuitErrors' PATH=~/.local/bin:$PATH pytest --controller=irctest.controllers.charybdis -k 'not Ergo and not deprecated and not strict and not testDoubleKickMessages and not testQuitErrors'

2
.github/workflows/inspircd.yml vendored
View File

@ -51,5 +51,5 @@ jobs:
# testNoticeNonexistentChannel fails because of https://github.com/inspircd/inspircd/issues/1849 # testNoticeNonexistentChannel fails because of https://github.com/inspircd/inspircd/issues/1849
# testDirectMessageEcho fails because of https://github.com/inspircd/inspircd/issues/1851 # testDirectMessageEcho fails because of https://github.com/inspircd/inspircd/issues/1851
# testKeyValidation fails because of https://github.com/inspircd/inspircd/issues/1850 # testKeyValidation fails because of https://github.com/inspircd/inspircd/issues/1850
PATH=~/.local/bin:$PATH pytest --controller irctest.controllers.inspircd -k 'not Oragono and not deprecated and not strict and not testNoticeNonexistentChannel and not testDirectMessageEcho and not testKeyValidation' PATH=~/.local/bin:$PATH pytest --controller irctest.controllers.inspircd -k 'not Ergo and not deprecated and not strict and not testNoticeNonexistentChannel and not testDirectMessageEcho and not testKeyValidation'

2
.github/workflows/ircd-seven.yml vendored
View File

@ -54,6 +54,6 @@ jobs:
# testPartMessage and testBasicPartRfc2812 fail because ircd-seven adds quotes around the message # testPartMessage and testBasicPartRfc2812 fail because ircd-seven adds quotes around the message
# testListOne fails because ircd-seven makes channels secret by default # testListOne fails because ircd-seven makes channels secret by default
# testQuitErrors is very flaky # testQuitErrors is very flaky
PATH=~/.local/bin:$PATH pytest --controller=irctest.controllers.ircd_seven -k 'not Oragono and not deprecated and not strict and not testDoubleKickMessages and not testNakWhole and not testPartMessage and not testBasicPartRfc2812 and not testListOne and not testQuitErrors' PATH=~/.local/bin:$PATH pytest --controller=irctest.controllers.ircd_seven -k 'not Ergo and not deprecated and not strict and not testDoubleKickMessages and not testNakWhole and not testPartMessage and not testBasicPartRfc2812 and not testListOne and not testQuitErrors'

18
.github/workflows/oragono.yml vendored
View File

@ -1,4 +1,4 @@
name: irctest with Oragono name: irctest with Ergo
on: on:
push: push:
@ -28,27 +28,27 @@ jobs:
with: with:
path: | path: |
~/.cache ~/.cache
$GITHUB_WORKSPACE/oragono $GITHUB_WORKSPACE/ergo
key: ${{ runner.os }}-oragono key: ${{ runner.os }}-ergo
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest -r requirements.txt pip install pytest -r requirements.txt
- name: Checkout Oragono - name: Checkout Ergo
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
repository: oragono/oragono repository: ergochat/ergo
ref: irctest_stable ref: irctest_stable
path: oragono path: ergo
- name: Build Oragono - name: Build Ergo
run: | run: |
cd $GITHUB_WORKSPACE/oragono/ cd $GITHUB_WORKSPACE/ergo/
make build make build
make install make install
- name: Test with pytest - name: Test with pytest
run: | run: |
PATH=~/go/bin:$PATH pytest --controller=irctest.controllers.oragono -k 'not deprecated' PATH=~/go/bin:$PATH pytest --controller=irctest.controllers.ergo -k 'not deprecated'

2
.github/workflows/solanum.yml vendored
View File

@ -48,7 +48,7 @@ jobs:
- name: Test with pytest - name: Test with pytest
run: | run: |
PATH=~/.local/bin:$PATH pytest --controller=irctest.controllers.solanum -k 'not Oragono and not deprecated and not strict and not testDoubleKickMessages' PATH=~/.local/bin:$PATH pytest --controller=irctest.controllers.solanum -k 'not Ergo and not deprecated and not strict and not testDoubleKickMessages'

2
CONTRIBUTING.md
View File

@ -59,7 +59,7 @@ See `irctest/server_tests/test_channel_operations.py` for example.
Tests for **pending/draft specifications are welcome**. Tests for **pending/draft specifications are welcome**.
Note that irctest also welcomes implementation-specific tests for Note that irctest also welcomes implementation-specific tests for
functional testing; for now only Oragono. functional testing; for now only Ergo.
This does not relax the requirement on documentating tests. This does not relax the requirement on documentating tests.

10
Makefile
View File

@ -1,9 +1,9 @@
.PHONY: all flakes oragono .PHONY: all flakes ergo
all: flakes oragono all: flakes ergo
flakes: flakes:
pyflakes3 ./irctest/cases.py ./irctest/client_mock.py ./irctest/controllers/oragono.py irctest/server_tests/*.py pyflakes3 ./irctest/cases.py ./irctest/client_mock.py ./irctest/controllers/ergo.py irctest/server_tests/*.py
oragono: ergo:
python3 -m pytest -k "not deprecated" --controller irctest.controllers.oragono python3 -m pytest -k "not deprecated" --controller irctest.controllers.ergo

23
README.md
View File

@ -27,7 +27,7 @@ pip3 install --user -r requirements.txt pyxmpp2-scram
python3 setup.py install --user python3 setup.py install --user
``` ```
Add `~/.local/bin/` (and/or `~/.local/bin/` for Oragono) Add `~/.local/bin/` (and/or `~/.local/bin/` for Ergo)
to your `PATH` if it is not. to your `PATH` if it is not.
``` ```
@ -53,10 +53,10 @@ For example, you can run `LUSERS`-related tests with `-k lusers`.
Or only tests based on RFC1459 with `-k rfc1459`. Or only tests based on RFC1459 with `-k rfc1459`.
By default, all tests run; even niche ones. So you probably always want to By default, all tests run; even niche ones. So you probably always want to
use these options: `-k 'not Oragono and not deprecated and not strict`. use these options: `-k 'not Ergo and not deprecated and not strict`.
This excludes: This excludes:
* `Oragono`-specific tests (included as Oragono uses irctest as its official * `Ergo`-specific tests (included as Ergo uses irctest as its official
integration test suite) integration test suite)
* tests for deprecated specifications, such as the IRCv3 METADATA * tests for deprecated specifications, such as the IRCv3 METADATA
specification specification
@ -65,16 +65,15 @@ This excludes:
## Run tests ## Run tests
To run (server) tests on Oragono: To run (server) tests on Ergo:
``` ```
cd /tmp/ cd /tmp/
git clone https://github.com/oragono/oragono.git git clone https://github.com/ergochat/ergo.git
cd oragono/ cd ergo/
make build
make install make install
cd ~/irctest cd ~/irctest
pytest --controller irctest.controllers.oragono -k 'not deprecated' pytest --controller irctest.controllers.ergo -k 'not deprecated'
``` ```
To run (server) tests on Solanum: To run (server) tests on Solanum:
@ -87,7 +86,7 @@ cd charybdis
./configure --prefix=$HOME/.local/ ./configure --prefix=$HOME/.local/
make -j 4 make -j 4
make install make install
pytest --controller irctest.controllers.solanum -k 'not Oragono and not deprecated and not strict' pytest --controller irctest.controllers.solanum -k 'not Ergo and not deprecated and not strict'
``` ```
To run (server) tests on Charybdis:: To run (server) tests on Charybdis::
@ -101,7 +100,7 @@ cd charybdis
make -j 4 make -j 4
make install make install
cd ~/irctest cd ~/irctest
pytest --controller irctest.controllers.charybdis -k 'not Oragono and not deprecated and not strict' pytest --controller irctest.controllers.charybdis -k 'not Ergo and not deprecated and not strict'
``` ```
To run (server) tests on ircd-seven: To run (server) tests on ircd-seven:
@ -130,7 +129,7 @@ patch src/inspircd.cpp < ../irctest/inspircd_mainloop.patch
make -j 4 make -j 4
make install make install
cd ~/irctest cd ~/irctest
pytest --controller irctest.controllers.inspircd -k 'not Oragono and not deprecated and not strict' pytest --controller irctest.controllers.inspircd -k 'not Ergo and not deprecated and not strict'
``` ```
To run (server) tests on Mammon: To run (server) tests on Mammon:
@ -138,7 +137,7 @@ To run (server) tests on Mammon:
``` ```
pip3 install --user git+https://github.com/mammon-ircd/mammon.git pip3 install --user git+https://github.com/mammon-ircd/mammon.git
cd ~/irctest cd ~/irctest
pytest --controller irctest.controllers.mammon -k 'not Oragono and not deprecated and not strict' pytest --controller irctest.controllers.mammon -k 'not Ergo and not deprecated and not strict'
``` ```
To run (client) tests on Limnoria: To run (client) tests on Limnoria:

6
irctest/basecontrollers.py
View File

@ -30,10 +30,10 @@ class TestCaseControllerConfig:
chathistory: bool = False chathistory: bool = False
"""Whether to enable chathistory features.""" """Whether to enable chathistory features."""
oragono_roleplay: bool = False ergo_roleplay: bool = False
"""Whether to enable the Oragono role-play commands.""" """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 """Oragono-specific configuration function that alters the dict in-place
This should be used as little as possible, using the other attributes instead; This should be used as little as possible, using the other attributes instead;
as they are work with any controller.""" as they are work with any controller."""

30
irctest/controllers/oragono.py → irctest/controllers/ergo.py
View File

@ -14,9 +14,9 @@ from irctest.cases import BaseServerTestCase
OPER_PWD = "frenchfries" OPER_PWD = "frenchfries"
BASE_CONFIG = { BASE_CONFIG = {
"network": {"name": "OragonoTest"}, "network": {"name": "ErgoTest"},
"server": { "server": {
"name": "oragono.test", "name": "ergo.test",
"listeners": {}, "listeners": {},
"max-sendq": "16k", "max-sendq": "16k",
"connection-limits": { "connection-limits": {
@ -127,14 +127,14 @@ def hash_password(password: Union[str, bytes]) -> str:
# simulate entry of password and confirmation: # simulate entry of password and confirmation:
input_ = password + b"\n" + password + b"\n" input_ = password + b"\n" + password + b"\n"
p = subprocess.Popen( p = subprocess.Popen(
["oragono", "genpasswd"], stdin=subprocess.PIPE, stdout=subprocess.PIPE ["ergo", "genpasswd"], stdin=subprocess.PIPE, stdout=subprocess.PIPE
) )
out, _ = p.communicate(input_) out, _ = p.communicate(input_)
return out.decode("utf-8") return out.decode("utf-8")
class OragonoController(BaseServerController, DirectoryBasedController): class ErgoController(BaseServerController, DirectoryBasedController):
software_name = "Oragono" software_name = "Ergo"
_port_wait_interval = 0.01 _port_wait_interval = 0.01
supported_sasl_mechanisms = {"PLAIN"} supported_sasl_mechanisms = {"PLAIN"}
supports_sts = True supports_sts = True
@ -168,15 +168,15 @@ class OragonoController(BaseServerController, DirectoryBasedController):
assert self.directory assert self.directory
enable_chathistory = self.test_config.chathistory 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: if enable_chathistory or enable_roleplay:
config = self.addMysqlToConfig(config) config = self.addMysqlToConfig(config)
if enable_roleplay: if enable_roleplay:
config["roleplay"] = {"enabled": True} config["roleplay"] = {"enabled": True}
if self.test_config.oragono_config: if self.test_config.ergo_config:
self.test_config.oragono_config(config) self.test_config.ergo_config(config)
self.port = port self.port = port
bind_address = "127.0.0.1:%s" % (port,) bind_address = "127.0.0.1:%s" % (port,)
@ -199,10 +199,10 @@ class OragonoController(BaseServerController, DirectoryBasedController):
self._config_path = os.path.join(self.directory, "server.yml") self._config_path = os.path.join(self.directory, "server.yml")
self._config = config self._config = config
self._write_config() self._write_config()
subprocess.call(["oragono", "initdb", "--conf", self._config_path, "--quiet"]) subprocess.call(["ergo", "initdb", "--conf", self._config_path, "--quiet"])
subprocess.call(["oragono", "mkcerts", "--conf", self._config_path, "--quiet"]) subprocess.call(["ergo", "mkcerts", "--conf", self._config_path, "--quiet"])
self.proc = subprocess.Popen( self.proc = subprocess.Popen(
["oragono", "run", "--conf", self._config_path, "--quiet"] ["ergo", "run", "--conf", self._config_path, "--quiet"]
) )
def registerUser( def registerUser(
@ -254,9 +254,9 @@ class OragonoController(BaseServerController, DirectoryBasedController):
config["datastore"]["mysql"] = { config["datastore"]["mysql"] = {
"enabled": True, "enabled": True,
"host": "localhost", "host": "localhost",
"user": "oragono", "user": "ergo",
"password": mysql_password, "password": mysql_password,
"history-database": "oragono_history", "history-database": "ergo_history",
"timeout": "3s", "timeout": "3s",
} }
config["accounts"]["multiclient"] = { config["accounts"]["multiclient"] = {
@ -289,5 +289,5 @@ class OragonoController(BaseServerController, DirectoryBasedController):
self.rehash(case, config) self.rehash(case, config)
def get_irctest_controller_class() -> Type[OragonoController]: def get_irctest_controller_class() -> Type[ErgoController]:
return OragonoController 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): class Bouncer(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testBouncer(self): def testBouncer(self):
"""Test basic bouncer functionality.""" """Test basic bouncer functionality."""
self.controller.registerUser(self, "observer", "observerpassword") 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): class ChannelForwarding(cases.BaseServerTestCase):
"""Test the +f channel forwarding mode.""" """Test the +f channel forwarding mode."""
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testChannelForwarding(self): def testChannelForwarding(self):
self.connectClient("bar", name="bar", capabilities=MODERN_CAPS) self.connectClient("bar", name="bar", capabilities=MODERN_CAPS)
self.connectClient("baz", name="baz", 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): class NoCTCPTestCase(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testQuit(self): def testQuit(self):
self.connectClient("bar") self.connectClient("bar")
self.joinChannel(1, "#chan") self.joinChannel(1, "#chan")
@ -903,7 +903,7 @@ class KeyTestCase(cases.BaseServerTestCase):
) )
if ERR_INVALIDMODEPARAM in {msg.command for msg in replies}: if ERR_INVALIDMODEPARAM in {msg.command for msg in replies}:
# First option: ERR_INVALIDMODEPARAM (eg. Oragono) # First option: ERR_INVALIDMODEPARAM (eg. Ergo)
return return
# Second and third options: truncating the key (eg. UnrealIRCd) # Second and third options: truncating the key (eg. UnrealIRCd)
@ -939,7 +939,7 @@ class KeyTestCase(cases.BaseServerTestCase):
class AuditoriumTestCase(cases.BaseServerTestCase): class AuditoriumTestCase(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testAuditorium(self): def testAuditorium(self):
self.connectClient("bar", name="bar", capabilities=MODERN_CAPS) self.connectClient("bar", name="bar", capabilities=MODERN_CAPS)
self.joinChannel("bar", "#auditorium") self.joinChannel("bar", "#auditorium")
@ -1123,7 +1123,7 @@ class BanMode(cases.BaseServerTestCase):
self.sendLine("bar", "JOIN #chan") self.sendLine("bar", "JOIN #chan")
self.assertMessageMatch(self.getMessage("bar"), command="JOIN") self.assertMessageMatch(self.getMessage("bar"), command="JOIN")
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testCaseInsensitive(self): def testCaseInsensitive(self):
"""Some clients allow unsetting modes if their argument matches """Some clients allow unsetting modes if their argument matches
up to normalization""" up to normalization"""
@ -1181,7 +1181,7 @@ class ModeratedMode(cases.BaseServerTestCase):
class OpModerated(cases.BaseServerTestCase): class OpModerated(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testOpModerated(self): def testOpModerated(self):
# test the +U channel mode # test the +U channel mode
self.connectClient("chanop", name="chanop", capabilities=MODERN_CAPS) self.connectClient("chanop", name="chanop", capabilities=MODERN_CAPS)
@ -1250,7 +1250,7 @@ class MuteExtban(cases.BaseServerTestCase):
(f474e7e6dc2d36f96150ebe33b23b4ea76814415) and it is the most popular (f474e7e6dc2d36f96150ebe33b23b4ea76814415) and it is the most popular
definition so we're going with that one.""" definition so we're going with that one."""
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testISupport(self): def testISupport(self):
self.connectClient(1) # Fetches ISUPPORT self.connectClient(1) # Fetches ISUPPORT
isupport = self.server_support isupport = self.server_support
@ -1431,7 +1431,7 @@ class MuteExtban(cases.BaseServerTestCase):
[msg for msg in replies if msg.command == "PRIVMSG"], [msg for msg in replies if msg.command == "PRIVMSG"],
) )
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testCapitalization(self): def testCapitalization(self):
""" """
Regression test for oragono #1370: mutes not correctly enforced against 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): class ChannelRename(cases.BaseServerTestCase):
"""Basic tests for channel-rename.""" """Basic tests for channel-rename."""
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testChannelRename(self): def testChannelRename(self):
self.connectClient("bar", name="bar", capabilities=MODERN_CAPS + [RENAME_CAP]) self.connectClient("bar", name="bar", capabilities=MODERN_CAPS + [RENAME_CAP])
self.connectClient("baz", name="baz", capabilities=MODERN_CAPS) 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: def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig(chathistory=True) return cases.TestCaseControllerConfig(chathistory=True)
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testInvalidTargets(self): def testInvalidTargets(self):
bar, pw = random_name("bar"), random_name("pw") bar, pw = random_name("bar"), random_name("pw")
self.controller.registerUser(self, bar, pw) self.controller.registerUser(self, bar, pw)
@ -79,7 +79,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
params=["CHATHISTORY", "INVALID_TARGET", ANYSTR, ANYSTR], params=["CHATHISTORY", "INVALID_TARGET", ANYSTR, ANYSTR],
) )
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testMessagesToSelf(self): def testMessagesToSelf(self):
bar, pw = random_name("bar"), random_name("pw") bar, pw = random_name("bar"), random_name("pw")
self.controller.registerUser(self, bar, 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.msgid for msg in echo_messages)), num_messages)
self.assertEqual(len(set(msg.time 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): def testChathistory(self):
self.connectClient( self.connectClient(
"bar", "bar",
@ -173,7 +173,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
self.validate_echo_messages(NUM_MESSAGES, echo_messages) self.validate_echo_messages(NUM_MESSAGES, echo_messages)
self.validate_chathistory(echo_messages, 1, chname) self.validate_chathistory(echo_messages, 1, chname)
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testChathistoryDMs(self): def testChathistoryDMs(self):
c1 = secrets.token_hex(12) c1 = secrets.token_hex(12)
c2 = secrets.token_hex(12) c2 = secrets.token_hex(12)
@ -483,7 +483,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
result = validate_chathistory_batch(self.getMessages(user)) result = validate_chathistory_batch(self.getMessages(user))
self.assertIn(echo_messages[7], result) self.assertIn(echo_messages[7], result)
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testChathistoryTagmsg(self): def testChathistoryTagmsg(self):
c1 = secrets.token_hex(12) c1 = secrets.token_hex(12)
c2 = secrets.token_hex(12) c2 = secrets.token_hex(12)
@ -577,9 +577,9 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
] ]
self.assertEqual(len(history_tagmsgs), 0) self.assertEqual(len(history_tagmsgs), 0)
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testChathistoryDMClientOnlyTags(self): def testChathistoryDMClientOnlyTags(self):
# regression test for Oragono #1411 # regression test for Ergo #1411
c1 = secrets.token_hex(12) c1 = secrets.token_hex(12)
c2 = secrets.token_hex(12) c2 = secrets.token_hex(12)
self.controller.registerUser(self, c1, "sesame1") self.controller.registerUser(self, c1, "sesame1")

4
irctest/server_tests/test_confusables.py
View File

@ -6,12 +6,12 @@ class ConfusablesTestCase(cases.BaseServerTestCase):
@staticmethod @staticmethod
def config() -> cases.TestCaseControllerConfig: def config() -> cases.TestCaseControllerConfig:
return 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"}} {"nick-reservation": {"enabled": True, "method": "strict"}}
) )
) )
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testConfusableNicks(self): def testConfusableNicks(self):
self.controller.registerUser(self, "evan", "sesame") self.controller.registerUser(self, "evan", "sesame")

10
irctest/server_tests/test_lusers.py
View File

@ -180,12 +180,12 @@ class LusersUnregisteredDefaultInvisibleTest(LusersUnregisteredTestCase):
@staticmethod @staticmethod
def config() -> cases.TestCaseControllerConfig: def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig( return cases.TestCaseControllerConfig(
oragono_config=lambda config: config["accounts"].update( ergo_config=lambda config: config["accounts"].update(
{"default-user-modes": "+i"} {"default-user-modes": "+i"}
) )
) )
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testLusers(self): def testLusers(self):
self.doLusersTest() self.doLusersTest()
lusers = self.getLusers("bar") lusers = self.getLusers("bar")
@ -195,7 +195,7 @@ class LusersUnregisteredDefaultInvisibleTest(LusersUnregisteredTestCase):
class LuserOpersTest(LusersTestCase): class LuserOpersTest(LusersTestCase):
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testLuserOpers(self): def testLuserOpers(self):
self.connectClient("bar", name="bar") self.connectClient("bar", name="bar")
lusers = self.getLusers("bar") lusers = self.getLusers("bar")
@ -238,12 +238,12 @@ class OragonoInvisibleDefaultTest(LusersTestCase):
@staticmethod @staticmethod
def config() -> cases.TestCaseControllerConfig: def config() -> cases.TestCaseControllerConfig:
return cases.TestCaseControllerConfig( return cases.TestCaseControllerConfig(
oragono_config=lambda config: config["accounts"].update( ergo_config=lambda config: config["accounts"].update(
{"default-user-modes": "+i"} {"default-user-modes": "+i"}
) )
) )
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testLusers(self): def testLusers(self):
self.connectClient("bar", name="bar") self.connectClient("bar", name="bar")
lusers = self.getLusers("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): class LengthLimitTestCase(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testLineAtLimit(self): def testLineAtLimit(self):
self.connectClient("bar", name="bar") self.connectClient("bar", name="bar")
self.getMessages("bar") self.getMessages("bar")
@ -97,7 +97,7 @@ class LengthLimitTestCase(cases.BaseServerTestCase):
self.assertMessageMatch(result, command="PONG") self.assertMessageMatch(result, command="PONG")
self.assertIn("x" * 450, result.params[-1]) self.assertIn("x" * 450, result.params[-1])
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testLineBeyondLimit(self): def testLineBeyondLimit(self):
self.connectClient("bar", name="bar") self.connectClient("bar", name="bar")
self.getMessages("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): class ReadqTestCase(cases.BaseServerTestCase):
"""Test responses to DoS attacks using long lines.""" """Test responses to DoS attacks using long lines."""
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
@cases.mark_capabilities("message-tags") @cases.mark_capabilities("message-tags")
def testReadqTags(self): def testReadqTags(self):
self.connectClient("mallory", name="mallory", capabilities=["message-tags"]) self.connectClient("mallory", name="mallory", capabilities=["message-tags"])
@ -12,7 +12,7 @@ class ReadqTestCase(cases.BaseServerTestCase):
self.sendLine("mallory", "PRIVMSG #test " + "a" * 16384) self.sendLine("mallory", "PRIVMSG #test " + "a" * 16384)
self.assertDisconnected("mallory") self.assertDisconnected("mallory")
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testReadqNoTags(self): def testReadqNoTags(self):
self.connectClient("mallory", name="mallory") self.connectClient("mallory", name="mallory")
self.joinChannel("mallory", "#test") self.joinChannel("mallory", "#test")

18
irctest/server_tests/test_register_verify.py
View File

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

4
irctest/server_tests/test_roleplay.py
View File

@ -7,9 +7,9 @@ from irctest.patma import StrRe
class RoleplayTestCase(cases.BaseServerTestCase): class RoleplayTestCase(cases.BaseServerTestCase):
@staticmethod @staticmethod
def config() -> cases.TestCaseControllerConfig: 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): def testRoleplay(self):
bar = random_name("bar") bar = random_name("bar")
qux = random_name("qux") 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): class StatusmsgTestCase(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testInIsupport(self): def testInIsupport(self):
"""Check that the expected STATUSMSG parameter appears in our isupport list.""" """Check that the expected STATUSMSG parameter appears in our isupport list."""
self.connectClient("foo") # detects ISUPPORT 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) self.assertEqual(whois_user.params[5], realname)
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testInvisibleWhois(self): def testInvisibleWhois(self):
"""Test interaction between MODE +i and RPL_WHOISCHANNELS.""" """Test interaction between MODE +i and RPL_WHOISCHANNELS."""
self.connectClient("userOne") self.connectClient("userOne")
@ -167,7 +167,7 @@ class AwayTestCase(cases.BaseServerTestCase):
class TestNoCTCPMode(cases.BaseServerTestCase): class TestNoCTCPMode(cases.BaseServerTestCase):
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testNoCTCPMode(self): def testNoCTCPMode(self):
self.connectClient("bar", "bar") self.connectClient("bar", "bar")
self.connectClient("qux", "qux") 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): class Utf8TestCase(cases.BaseServerTestCase, cases.OptionalityHelper):
@cases.mark_specifications("Oragono") @cases.mark_specifications("Ergo")
def testUtf8Validation(self): def testUtf8Validation(self):
self.connectClient( self.connectClient(
"bar", "bar",

2
irctest/server_tests/test_znc_playback.py
View File

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

2
irctest/specifications.py
View File

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

2
pytest.ini
View File

@ -6,7 +6,7 @@ markers =
IRCv3 IRCv3
modern modern
ircdocs ircdocs
Oragono Ergo
# misc marks # misc marks
strict strict