Update Sable and make LINKS test support it

This should stop the mute extban test failing when extbanformat is set to name (which will soon be the default in git master).

.github/workflows/test-devel_release.yml

@@ -8,7 +8,7 @@ jobs:
     - name: Create directories
       run: cd ~/; mkdir -p .local/ go/
     - name: Cache dependencies
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         key: 3-${{ runner.os }}-anope-devel_release
         path: '~/.cache
@@ -16,13 +16,13 @@ jobs:
           ${ github.workspace }/anope
 
           '
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.11
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.11
     - name: Checkout Anope
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: anope
         ref: '2.0'
@@ -37,7 +37,7 @@ jobs:
     - name: Make artefact tarball
       run: cd ~; tar -czf artefacts-anope.tar.gz .local/ go/
     - name: Upload build artefacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: installed-anope
         path: ~/artefacts-*.tar.gz
@@ -47,13 +47,13 @@ jobs:
     steps:
     - name: Create directories
       run: cd ~/; mkdir -p .local/ go/
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.11
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.11
     - name: Checkout InspIRCd
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: inspircd
         ref: insp3
@@ -67,7 +67,7 @@ jobs:
     - name: Make artefact tarball
       run: cd ~; tar -czf artefacts-inspircd.tar.gz .local/ go/
     - name: Upload build artefacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: installed-inspircd
         path: ~/artefacts-*.tar.gz
@@ -81,9 +81,9 @@ jobs:
     - test-inspircd-atheme
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Download Artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         path: artifacts
     - name: Install dashboard dependencies
@@ -108,13 +108,13 @@ jobs:
     - build-inspircd
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.11
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.11
     - name: Download build artefacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: installed-inspircd
         path: '~'
@@ -126,13 +126,15 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
         make inspircd
       timeout-minutes: 30
     - if: always()
       name: Publish results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: pytest-results_inspircd_devel_release
         path: pytest.xml
@@ -142,18 +144,18 @@ jobs:
     - build-anope
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.11
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.11
     - name: Download build artefacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: installed-inspircd
         path: '~'
     - name: Download build artefacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: installed-anope
         path: '~'
@@ -165,13 +167,15 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH  make
         inspircd-anope
       timeout-minutes: 30
     - if: always()
       name: Publish results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: pytest-results_inspircd-anope_devel_release
         path: pytest.xml
@@ -180,13 +184,13 @@ jobs:
     - build-inspircd
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.11
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.11
     - name: Download build artefacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: installed-inspircd
         path: '~'
@@ -198,13 +202,15 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
         make inspircd-atheme
       timeout-minutes: 30
     - if: always()
       name: Publish results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: pytest-results_inspircd-atheme_devel_release
         path: pytest.xml

Makefile

@@ -84,15 +84,12 @@ LIMNORIA_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 private_chathistory can't pass because Sable does not implement CHATHISTORY for DMs
-
 SABLE_SELECTORS := \
 	not Ergo \
 	and not deprecated \
 	and not strict \
 	and not arbitrary_client_tags \
 	and not react_tag \
-	and not private_chathistory \
 	and not list and not lusers and not time and not info \
 	$(EXTRA_SELECTORS)
 

irctest/basecontrollers.py

@@ -11,7 +11,20 @@ import subprocess
 import tempfile
 import textwrap
 import time
-from typing import IO, Any, Callable, Dict, Iterator, List, Optional, Set, Tuple, Type
+from typing import (
+    IO,
+    Any,
+    Callable,
+    Dict,
+    Iterator,
+    List,
+    Optional,
+    Sequence,
+    Set,
+    Tuple,
+    Type,
+    Union,
+)
 
 import irctest
 
@@ -74,6 +87,7 @@ class _BaseController:
     _port_lock = FileLock(Path(tempfile.gettempdir()) / "irctest_ports.json.lock")
 
     def __init__(self, test_config: TestCaseControllerConfig):
+        self.debug_mode = os.getenv("IRCTEST_DEBUG_LOGS", "0").lower() in ("true", "1")
         self.test_config = test_config
         self.proc = None
         self._own_ports: Set[Tuple[str, int]] = set()
@@ -130,6 +144,12 @@ class _BaseController:
                 used_ports.remove((hostname, port))
                 self._own_ports.remove((hostname, port))
 
+    def execute(
+        self, command: Sequence[Union[str, Path]], **kwargs: Any
+    ) -> subprocess.Popen:
+        output_to = None if self.debug_mode else subprocess.DEVNULL
+        return subprocess.Popen(command, stderr=output_to, stdout=output_to, **kwargs)
+
 
 class DirectoryBasedController(_BaseController):
     """Helper for controllers whose software configuration is based on an

irctest/controllers/anope_services.py

@@ -8,7 +8,7 @@ from irctest.basecontrollers import BaseServicesController, DirectoryBasedContro
 
 TEMPLATE_CONFIG = """
 serverinfo {{
-    name = "services.example.org"
+    name = "My.Little.Services"
     description = "Anope IRC Services"
     numeric = "00A"
     pid = "services.pid"
@@ -136,16 +136,19 @@ class AnopeController(BaseServicesController, DirectoryBasedController):
             Path(services_path).parent.parent / "modules"
         )
 
-        self.proc = subprocess.Popen(
+        extra_args = []
+        if self.debug_mode:
+            extra_args.append("--debug")
+
+        self.proc = self.execute(
             [
                 "anope",
                 "--config=services.conf",  # can't be an absolute path in 2.0
                 "--nofork",  # don't fork
                 "--nopid",  # don't write a pid
+                *extra_args,
             ],
             cwd=self.directory,
-            # stdout=subprocess.DEVNULL,
-            # stderr=subprocess.DEVNULL,
         )
 
 

irctest/controllers/atheme_services.py

@@ -1,4 +1,3 @@
-import subprocess
 from typing import Optional, Type
 
 import irctest
@@ -25,7 +24,7 @@ loadmodule "modules/saslserv/plain";
 #loadmodule "modules/saslserv/scram";
 
 serverinfo {{
-    name = "services.example.org";
+    name = "My.Little.Services";
     desc = "Atheme IRC Services";
     numeric = "00A";
     netname = "testnet";
@@ -75,7 +74,7 @@ class AthemeController(BaseServicesController, DirectoryBasedController):
             )
 
         assert self.directory
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 "atheme-services",
                 "-n",  # don't fork
@@ -88,8 +87,6 @@ class AthemeController(BaseServicesController, DirectoryBasedController):
                 "-D",
                 self.directory,
             ],
-            # stdout=subprocess.DEVNULL,
-            # stderr=subprocess.DEVNULL,
         )
 
     def registerUser(

irctest/controllers/bahamut.py

@@ -1,6 +1,5 @@
 from pathlib import Path
 import shutil
-import subprocess
 from typing import Optional, Set, Type
 
 from irctest.basecontrollers import BaseServerController, DirectoryBasedController
@@ -15,7 +14,7 @@ options {{
     network_name    unconfigured;
     allow_split_ops;                # Give ops in empty channels
 
-    services_name   services.example.org;
+    services_name   My.Little.Services;
 
     // if you need to link more than 1 server, uncomment the following line
     servtype        hub;
@@ -45,7 +44,7 @@ class {{
 
 /* for services */
 super {{
-    "services.example.org";
+    "My.Little.Services";
 }};
 
 
@@ -58,7 +57,7 @@ class {{
 
 /* our services */
 connect {{
-    name        services.example.org;
+    name        My.Little.Services;
     host        *@127.0.0.1;  # unfortunately, masks aren't allowed here
     apasswd     password;
     cpasswd     password;
@@ -92,7 +91,7 @@ class BahamutController(BaseServerController, DirectoryBasedController):
     software_name = "Bahamut"
     supported_sasl_mechanisms: Set[str] = set()
     supports_sts = False
-    nickserv = "NickServ@services.example.org"
+    nickserv = "NickServ@My.Little.Services"
 
     def create_config(self) -> None:
         super().create_config()
@@ -150,7 +149,7 @@ class BahamutController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 *faketime_cmd,
                 "ircd",

irctest/controllers/base_hybrid.py

@@ -1,5 +1,5 @@
+from pathlib import Path
 import shutil
-import subprocess
 from typing import Optional
 
 from irctest.basecontrollers import BaseServerController, DirectoryBasedController
@@ -51,6 +51,8 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
             )
         else:
             ssl_config = ""
+        binary_path = shutil.which(self.binary_name)
+        assert binary_path, f"Could not find '{binary_path}' executable"
         with self.open_file("server.conf") as fd:
             fd.write(
                 (self.template_config).format(
@@ -60,6 +62,7 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
                     services_port=services_port,
                     password_field=password_field,
                     ssl_config=ssl_config,
+                    install_prefix=Path(binary_path).parent.parent,
                 )
             )
         assert self.directory
@@ -70,7 +73,7 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 *faketime_cmd,
                 self.binary_name,
@@ -80,7 +83,6 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
                 "-pidfile",
                 self.directory / "server.pid",
             ],
-            # stderr=subprocess.DEVNULL,
         )
 
         if run_services:

irctest/controllers/charybdis.py

@@ -44,7 +44,7 @@ channel {{
     displayed_usercount = 0;
 }};
 
-connect "services.example.org" {{
+connect "My.Little.Services" {{
     host = "localhost";  # Used to validate incoming connection
     port = 0;  # We don't need servers to connect to services
     send_password = "password";
@@ -53,7 +53,7 @@ connect "services.example.org" {{
     flags = topicburst;
 }};
 service {{
-    name = "services.example.org";
+    name = "My.Little.Services";
 }};
 
 privset "omnioper" {{

irctest/controllers/dlk_services.py

@@ -13,7 +13,7 @@ TEMPLATE_DLK_CONFIG = """\
 info {{
     SID "00A";
     network-name "testnetwork";
-    services-name "services.example.org";
+    services-name "My.Little.Services";
     admin-email "admin@example.org";
 }}
 
@@ -200,7 +200,7 @@ class DlkController(BaseServicesController, DirectoryBasedController):
             fd.write(TEMPLATE_DLK_WP_CONFIG.format(**template_vars))
         (dlk_conf_dir / "modules.conf").symlink_to(self.dlk_path / "conf/modules.conf")
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 "php",
                 "src/dalek",

irctest/controllers/ergo.py

@@ -58,6 +58,11 @@ BASE_CONFIG = {
             "enabled": True,
             "method": "strict",
         },
+        "login-throttling": {
+            "enabled": True,
+            "duration": "1m",
+            "max-attempts": 3,
+        },
     },
     "channels": {"registration": {"enabled": True}},
     "datastore": {"path": None},
@@ -208,7 +213,7 @@ class ErgoController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [*faketime_cmd, "ergo", "run", "--conf", self._config_path, "--quiet"]
         )
 

irctest/controllers/girc.py

@@ -1,4 +1,3 @@
-import subprocess
 from typing import Optional, Type
 
 from irctest import authentication, tls
@@ -31,7 +30,7 @@ class GircController(BaseClientController, DirectoryBasedController):
             args += ["--sasl-fail-is-ok"]
 
         # Runs a client with the config given as arguments
-        self.proc = subprocess.Popen(["girc_test", "connect"] + args)
+        self.proc = self.execute(["girc_test", "connect"] + args)
 
 
 def get_irctest_controller_class() -> Type[GircController]:

irctest/controllers/hybrid.py

@@ -3,6 +3,9 @@ from typing import Set, Type
 from .base_hybrid import BaseHybridController
 
 TEMPLATE_CONFIG = """
+module_base_path = "{install_prefix}/lib/ircd-hybrid/modules";
+.include "./reference.modules.conf"
+
 serverinfo {{
     name = "My.Little.Server";
     sid = "42X";
@@ -39,7 +42,7 @@ class {{
     connectfreq = 5 minutes;
 }};
 connect {{
-    name = "services.example.org";
+    name = "My.Little.Services";
     host = "127.0.0.1";  # Used to validate incoming connection
     port = 0;  # We don't need servers to connect to services
     send_password = "password";
@@ -47,7 +50,7 @@ connect {{
     class = "server";
 }};
 service {{
-    name = "services.example.org";
+    name = "My.Little.Services";
 }};
 
 auth {{

irctest/controllers/inspircd.py

@@ -33,14 +33,15 @@ TEMPLATE_CONFIG = """
       class="ServerOperators"
       >
 
-<options casemapping="ascii">
+<options casemapping="ascii"
+         extbanformat="any">
 
 # Disable 'NOTICE #chan :*** foo invited bar into the channel-
 <security announceinvites="none">
 
 # Services:
 <bind address="{services_hostname}" port="{services_port}" type="servers">
-<link name="services.example.org"
+<link name="My.Little.Services"
     ipaddr="{services_hostname}"
     port="{services_port}"
     allowmask="*"
@@ -48,11 +49,9 @@ TEMPLATE_CONFIG = """
     sendpass="password"
     >
 <module name="spanningtree">
-<module name="services_account">
 <module name="hidechans">  # Anope errors when missing
-<module name="svshold">  # Atheme raises a warning when missing
 <sasl requiressl="no"
-      target="services.example.org">
+      target="My.Little.Services">
 
 # Protocol:
 <module name="banexception">
@@ -71,14 +70,10 @@ TEMPLATE_CONFIG = """
 <module name="ircv3_servertime">
 <module name="monitor">
 <module name="m_muteban">  # for testing mute extbans
-<module name="namesx"> # For multi-prefix
 <module name="sasl">
 <module name="uhnames">  # For userhost-in-names
-
-# HELP/HELPOP
 <module name="alias">  # for the HELP alias
-<module name="{help_module_name}">
-<include file="examples/{help_module_name}.conf.example">
+{version_config}
 
 # Misc:
 <log method="file" type="*" level="debug" target="/tmp/ircd-{port}.log">
@@ -90,6 +85,26 @@ TEMPLATE_SSL_CONFIG = """
 <openssl certfile="{pem_path}" keyfile="{key_path}" dhfile="{dh_path}" hash="sha1">
 """
 
+TEMPLATE_V3_CONFIG = """
+<module name="namesx"> # For multi-prefix
+<module name="services_account">
+<module name="svshold">  # Atheme raises a warning when missing
+
+# HELP/HELPOP
+<module name="helpop">
+<include file="examples/helpop.conf.example">
+"""
+
+TEMPLATE_V4_CONFIG = """
+<module name="account">
+<module name="multiprefix"> # For multi-prefix
+<module name="services">
+
+# HELP/HELPOP
+<module name="help">
+<include file="examples/help.example.conf">
+"""
+
 
 @functools.lru_cache()
 def installed_version() -> int:
@@ -98,8 +113,9 @@ def installed_version() -> int:
         return 3
     if output.startswith("InspIRCd-4"):
         return 4
-    else:
-        assert False, f"unexpected version: {output}"
+    if output.startswith("InspIRCd-5"):
+        return 5
+    assert False, f"unexpected version: {output}"
 
 
 class InspircdController(BaseServerController, DirectoryBasedController):
@@ -141,9 +157,9 @@ class InspircdController(BaseServerController, DirectoryBasedController):
             ssl_config = ""
 
         if installed_version() == 3:
-            help_module_name = "helpop"
-        elif installed_version() == 4:
-            help_module_name = "help"
+            version_config = TEMPLATE_V3_CONFIG
+        elif installed_version() >= 4:
+            version_config = TEMPLATE_V4_CONFIG
         else:
             assert False, f"unexpected version: {installed_version()}"
 
@@ -156,7 +172,7 @@ class InspircdController(BaseServerController, DirectoryBasedController):
                     services_port=services_port,
                     password_field=password_field,
                     ssl_config=ssl_config,
-                    help_module_name=help_module_name,
+                    version_config=version_config,
                 )
             )
         assert self.directory
@@ -167,15 +183,22 @@ class InspircdController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        extra_args = []
+        if self.debug_mode:
+            if installed_version() >= 4:
+                extra_args.append("--protocoldebug")
+            else:
+                extra_args.append("--debug")
+
+        self.proc = self.execute(
             [
                 *faketime_cmd,
                 "inspircd",
                 "--nofork",
                 "--config",
                 self.directory / "server.conf",
+                *extra_args,
             ],
-            stdout=subprocess.DEVNULL,
         )
 
         if run_services:

irctest/controllers/irc2.py

@@ -1,5 +1,4 @@
 import shutil
-import subprocess
 from typing import Optional, Type
 
 from irctest.basecontrollers import (
@@ -78,7 +77,7 @@ class Irc2Controller(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 *faketime_cmd,
                 "ircd",
@@ -88,7 +87,6 @@ class Irc2Controller(BaseServerController, DirectoryBasedController):
                 "-f",
                 self.directory / "server.conf",
             ],
-            # stderr=subprocess.DEVNULL,
         )
 
 

irctest/controllers/ircu2.py

@@ -1,5 +1,4 @@
 import shutil
-import subprocess
 from typing import Optional, Type
 
 from irctest.basecontrollers import (
@@ -97,7 +96,7 @@ class Ircu2Controller(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 *faketime_cmd,
                 "ircd",
@@ -107,7 +106,6 @@ class Ircu2Controller(BaseServerController, DirectoryBasedController):
                 "-x",
                 "DEBUG",
             ],
-            # stderr=subprocess.DEVNULL,
         )
 
 

irctest/controllers/limnoria.py

@@ -1,4 +1,3 @@
-import subprocess
 from typing import Optional, Type
 
 from irctest import authentication, tls
@@ -84,7 +83,7 @@ class LimnoriaController(BaseClientController, DirectoryBasedController):
                 )
             )
         assert self.directory
-        self.proc = subprocess.Popen(["supybot", self.directory / "bot.conf"])
+        self.proc = self.execute(["supybot", self.directory / "bot.conf"])
 
 
 def get_irctest_controller_class() -> Type[LimnoriaController]:

irctest/controllers/mammon.py

@@ -1,5 +1,4 @@
 import shutil
-import subprocess
 from typing import Optional, Set, Type
 
 from irctest.basecontrollers import (
@@ -116,7 +115,7 @@ class MammonController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 *faketime_cmd,
                 "mammond",

irctest/controllers/ngircd.py

@@ -1,5 +1,4 @@
 import shutil
-import subprocess
 from typing import Optional, Set, Type
 
 from irctest.basecontrollers import BaseServerController, DirectoryBasedController
@@ -15,7 +14,7 @@ TEMPLATE_CONFIG = """
     {password_field}
 
 [Server]
-    Name = services.example.org
+    Name = My.Little.Services
     MyPassword = password
     PeerPassword = password
     Passive = yes  # don't connect to it
@@ -28,6 +27,9 @@ TEMPLATE_CONFIG = """
 [Operator]
     Name = operuser
     Password = operpassword
+
+[Limits]
+    MaxNickLength = 32  # defaults to 9
 """
 
 
@@ -92,7 +94,7 @@ class NgircdController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 *faketime_cmd,
                 "ngircd",
@@ -100,7 +102,6 @@ class NgircdController(BaseServerController, DirectoryBasedController):
                 "--config",
                 self.directory / "server.conf",
             ],
-            # stdout=subprocess.DEVNULL,
         )
 
         if run_services:

irctest/controllers/plexus4.py

@@ -44,7 +44,7 @@ class {{
     connectfreq = 5 minutes;
 }};
 connect {{
-    name = "services.example.org";
+    name = "My.Little.Services";
     host = "127.0.0.1";  # Used to validate incoming connection
     port = 0;  # We don't need servers to connect to services
     send_password = "password";
@@ -52,7 +52,7 @@ connect {{
     class = "server";
 }};
 service {{
-    name = "services.example.org";
+    name = "My.Little.Services";
 }};
 
 auth {{

irctest/controllers/sable.py

@@ -107,6 +107,8 @@ NETWORK_CONFIG = """
 
 NETWORK_CONFIG_CONFIG = """
 {
+    "object_expiry": 300,
+
     "opers": [
         {
             "name": "operuser",
@@ -394,7 +396,7 @@ class SableController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 *faketime_cmd,
                 "sable_ircd",
@@ -408,6 +410,7 @@ class SableController(BaseServerController, DirectoryBasedController):
             ],
             cwd=self.directory,
             preexec_fn=os.setsid,
+            env={"RUST_BACKTRACE": "1", **os.environ},
         )
         self.pgroup_id = os.getpgid(self.proc.pid)
 
@@ -474,7 +477,7 @@ class SableServicesController(BaseServicesController):
         with self.server_controller.open_file("configs/services.conf") as fd:
             fd.write(SERVICES_CONFIG % self.server_controller.template_vars)
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 "sable_services",
                 "--foreground",
@@ -485,6 +488,7 @@ class SableServicesController(BaseServicesController):
             ],
             cwd=self.server_controller.directory,
             preexec_fn=os.setsid,
+            env={"RUST_BACKTRACE": "1", **os.environ},
         )
         self.pgroup_id = os.getpgid(self.proc.pid)
 

irctest/controllers/snircd.py

@@ -1,5 +1,4 @@
 import shutil
-import subprocess
 from typing import Optional, Type
 
 from irctest.basecontrollers import (
@@ -96,7 +95,7 @@ class SnircdController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 *faketime_cmd,
                 "ircd",
@@ -106,7 +105,6 @@ class SnircdController(BaseServerController, DirectoryBasedController):
                 "-x",
                 "DEBUG",
             ],
-            # stderr=subprocess.DEVNULL,
         )
 
 

irctest/controllers/sopel.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-import subprocess
 import tempfile
 from typing import Optional, TextIO, Type, cast
 
@@ -73,7 +72,7 @@ class SopelController(BaseClientController):
                     auth_method="auth_method = sasl" if auth else "",
                 )
             )
-        self.proc = subprocess.Popen(["sopel", "-c", self.filename])
+        self.proc = self.execute(["sopel", "-c", self.filename])
 
 
 def get_irctest_controller_class() -> Type[SopelController]:

irctest/controllers/thelounge.py

@@ -1,6 +1,5 @@
 import json
 import os
-import subprocess
 from typing import Optional, Type
 
 from irctest import authentication, tls
@@ -96,7 +95,7 @@ class TheLoungeController(BaseClientController, DirectoryBasedController):
             )
         with self.open_file("users/testuser.json", "r") as fd:
             print("config", json.load(fd)["networks"][0]["saslPassword"])
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [os.environ.get("THELOUNGE_BIN", "thelounge"), "start"],
             env={**os.environ, "THELOUNGE_HOME": str(self.directory)},
         )

irctest/controllers/unrealircd.py

@@ -64,7 +64,7 @@ listen {{
     options {{ serversonly; }}
 }}
 
-link services.example.org {{
+link My.Little.Services {{
     incoming {{
         mask *;
     }}
@@ -72,11 +72,11 @@ link services.example.org {{
     class servers;
 }}
 ulines {{
-    services.example.org;
+    My.Little.Services;
 }}
 
 set {{
-    sasl-server services.example.org;
+    sasl-server My.Little.Services;
     kline-address "example@example.org";
     network-name "ExampleNET";
     default-server "irc.example.org";
@@ -261,7 +261,7 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
             faketime_cmd = []
 
         with _STARTSTOP_LOCK():
-            self.proc = subprocess.Popen(
+            self.proc = self.execute(
                 [
                     *faketime_cmd,
                     "unrealircd",
@@ -270,7 +270,6 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
                     "-f",
                     self.directory / "unrealircd.conf",
                 ],
-                # stdout=subprocess.DEVNULL,
             )
             self.wait_for_port()
 

irctest/server_tests/buffering.py

@@ -86,10 +86,10 @@ class BufferingTestCase(cases.BaseServerTestCase):
             if messages and ERR_INPUTTOOLONG in (m.command for m in messages):
                 # https://defs.ircdocs.horse/defs/numerics.html#err-inputtoolong-417
                 self.assertGreater(
-                    len(line + payload + "\r\n"),
+                    len((line + payload + "\r\n").encode()),
                     512 - overhead,
-                    "Got ERR_INPUTTOOLONG for a messag that should fit "
-                    "withing 512 characters.",
+                    "Got ERR_INPUTTOOLONG for a message that should fit "
+                    "within 512 characters.",
                 )
                 continue
 
@@ -125,11 +125,24 @@ class BufferingTestCase(cases.BaseServerTestCase):
                     f"expected payload to be a prefix of {payload!r}, "
                     f"but got {payload!r}",
                 )
+            if self.controller.software_name == "Ergo":
+                self.assertTrue(
+                    payload_intact,
+                    f"Ergo should not truncate messages: {repr(line + payload)}, {repr(received_line)}",
+                )
 
     def get_overhead(self, client1, client2, colon):
-        self.sendLine(client1, f"PRIVMSG nick2 {colon}a\r\n")
+        """Compute the overhead added to client1's message:
+                          PRIVMSG nick2 a\r\n
+        :nick1!~user@host PRIVMSG nick2 :a\r\n
+        So typically client1's NUH length plus either 2 or 3 bytes
+        (the initial colon, the space between source and command, and possibly
+        a colon preceding the trailing).
+        """
+        outgoing = f"PRIVMSG nick2 {colon}a\r\n"
+        self.sendLine(client1, outgoing)
         line = self._getLine(client2)
-        return len(line) - len(f"PRIVMSG nick2 {colon}a\r\n")
+        return len(line) - len(outgoing.encode())
 
     def _getLine(self, client) -> bytes:
         line = b""

irctest/server_tests/chmodes/modeis.py

@@ -0,0 +1,67 @@
+from irctest import cases
+from irctest.numerics import RPL_CHANNELCREATED, RPL_CHANNELMODEIS
+from irctest.patma import ANYSTR, ListRemainder, StrRe
+
+
+class RplChannelModeIsTestCase(cases.BaseServerTestCase):
+    @cases.mark_specifications("Modern")
+    def testChannelModeIs(self):
+        """Test RPL_CHANNELMODEIS and RPL_CHANNELCREATED as responses to
+        `MODE #channel`:
+        <https://modern.ircdocs.horse/#rplcreationtime-329>
+        <https://modern.ircdocs.horse/#rplchannelmodeis-324>
+        """
+        expected_numerics = {RPL_CHANNELMODEIS, RPL_CHANNELCREATED}
+        if self.controller.software_name in ("irc2", "Sable"):
+            # irc2 and Sable don't use timestamps for conflict resolution,
+            # consequently they don't store the channel creation timestamp
+            # and don't send RPL_CHANNELCREATED
+            expected_numerics = {RPL_CHANNELMODEIS}
+
+        self.connectClient("chanop", name="chanop")
+        self.joinChannel("chanop", "#chan")
+        # i, n, and t are specified by RFC1459; some of them may be on by default,
+        # but after this, at least those three should be enabled:
+        self.sendLine("chanop", "MODE #chan +int")
+        self.getMessages("chanop")
+
+        self.sendLine("chanop", "MODE #chan")
+        messages = self.getMessages("chanop")
+        self.assertEqual(expected_numerics, {msg.command for msg in messages})
+        for message in messages:
+            if message.command == RPL_CHANNELMODEIS:
+                # the final parameters are the mode string (e.g. `+int`),
+                # and then optionally any mode parameters (in case the ircd
+                # lists a mode that takes a parameter)
+                self.assertMessageMatch(
+                    message,
+                    command=RPL_CHANNELMODEIS,
+                    params=["chanop", "#chan", ListRemainder(ANYSTR, min_length=1)],
+                )
+                final_param = message.params[2]
+                self.assertEqual(final_param[0], "+")
+                enabled_modes = list(final_param[1:])
+                break
+
+        self.assertLessEqual({"i", "n", "t"}, set(enabled_modes))
+
+        # remove all the modes listed by RPL_CHANNELMODEIS
+        self.sendLine("chanop", f"MODE #chan -{''.join(enabled_modes)}")
+        response = self.getMessage("chanop")
+        # we should get something like: MODE #chan -int
+        self.assertMessageMatch(
+            response, command="MODE", params=["#chan", StrRe("^-.*")]
+        )
+        self.assertEqual(set(response.params[1][1:]), set(enabled_modes))
+
+        self.sendLine("chanop", "MODE #chan")
+        messages = self.getMessages("chanop")
+        self.assertEqual(expected_numerics, {msg.command for msg in messages})
+        # all modes have been disabled; the correct representation of this is `+`
+        for message in messages:
+            if message.command == RPL_CHANNELMODEIS:
+                self.assertMessageMatch(
+                    message,
+                    command=RPL_CHANNELMODEIS,
+                    params=["chanop", "#chan", "+"],
+                )

irctest/server_tests/chmodes/operator.py

@@ -0,0 +1,159 @@
+from irctest import cases
+from irctest.numerics import (
+    ERR_CHANOPRIVSNEEDED,
+    ERR_NOSUCHCHANNEL,
+    ERR_NOSUCHNICK,
+    ERR_NOTONCHANNEL,
+    ERR_USERNOTINCHANNEL,
+)
+
+
+class ChannelOperatorModeTestCase(cases.BaseServerTestCase):
+    """Test various error and success cases around the channel operator mode:
+    <https://modern.ircdocs.horse/#channel-operators>
+    <https://modern.ircdocs.horse/#mode-message>
+    """
+
+    def setupNicks(self):
+        """Set up a standard set of three nicknames and two channels
+        for testing channel-user MODE interactions."""
+        # first nick to join the channel is privileged:
+        self.connectClient("chanop", name="chanop")
+        self.joinChannel("chanop", "#chan")
+
+        self.connectClient("unprivileged", name="unprivileged")
+        self.joinChannel("unprivileged", "#chan")
+        self.getMessages("chanop")
+
+        self.connectClient("unrelated", name="unrelated")
+        self.joinChannel("unrelated", "#unrelated")
+        self.joinChannel("unprivileged", "#unrelated")
+        self.getMessages("unrelated")
+
+    @cases.mark_specifications("Modern")
+    @cases.xfailIfSoftware(["irc2"], "broken in irc2")
+    def testChannelOperatorModeSenderPrivsNeeded(self):
+        """Test that +o from a channel member without the necessary privileges
+        fails as expected."""
+        self.setupNicks()
+        # sender is a channel member but without the necessary privileges:
+        self.sendLine("unprivileged", "MODE #chan +o unprivileged")
+        messages = self.getMessages("unprivileged")
+        self.assertEqual(len(messages), 1)
+        self.assertMessageMatch(messages[0], command=ERR_CHANOPRIVSNEEDED)
+
+    @cases.mark_specifications("Modern")
+    def testChannelOperatorModeTargetNotInChannel(self):
+        """Test that +o targeting a user not present in the channel fails
+        as expected."""
+        self.setupNicks()
+        # sender is a chanop, but target nick is not in the channel:
+        self.sendLine("chanop", "MODE #chan +o unrelated")
+        messages = self.getMessages("chanop")
+        self.assertEqual(len(messages), 1)
+        self.assertMessageMatch(messages[0], command=ERR_USERNOTINCHANNEL)
+
+    @cases.mark_specifications("Modern")
+    def testChannelOperatorModeTargetDoesNotExist(self):
+        """Test that +o targeting a nonexistent nick fails as expected."""
+        self.setupNicks()
+        # sender is a chanop, but target nick does not exist:
+        self.sendLine("chanop", "MODE #chan +o nobody")
+        messages = self.getMessages("chanop")
+        # ERR_NOSUCHNICK is typical, Bahamut additionally sends ERR_USERNOTINCHANNEL
+        if self.controller.software_name != "Bahamut":
+            self.assertEqual(len(messages), 1)
+            self.assertMessageMatch(messages[0], command=ERR_NOSUCHNICK)
+        else:
+            self.assertLessEqual(len(messages), 2)
+            commands = {message.command for message in messages}
+            self.assertLessEqual({ERR_NOSUCHNICK}, commands)
+            self.assertLessEqual(commands, {ERR_NOSUCHNICK, ERR_USERNOTINCHANNEL})
+
+    @cases.mark_specifications("Modern")
+    @cases.xfailIf(
+        lambda self: bool(
+            self.controller.software_name == "UnrealIRCd"
+            and self.controller.software_version == 5
+        ),
+        "UnrealIRCd <6.1.7 returns ERR_NOSUCHNICK on non-existent channel",
+    )
+    def testChannelOperatorModeChannelDoesNotExist(self):
+        """Test that +o targeting a nonexistent channel fails as expected.
+
+        "If <target> is a channel that does not exist on the network,
+        # the ERR_NOSUCHCHANNEL (403) numeric is returned."
+        """
+        self.setupNicks()
+        # target channel does not exist, but target nick does:
+        self.sendLine("chanop", "MODE #nonexistentchan +o chanop")
+        messages = self.getMessages("chanop")
+        self.assertEqual(len(messages), 1)
+        self.assertMessageMatch(messages[0], command=ERR_NOSUCHCHANNEL)
+
+    @cases.mark_specifications("Modern")
+    @cases.xfailIf(
+        lambda self: bool(
+            self.controller.software_name == "UnrealIRCd"
+            and self.controller.software_version == 5
+        ),
+        "UnrealIRCd <6.1.7 returns ERR_NOSUCHNICK on non-existent channel",
+    )
+    def testChannelOperatorModeChannelAndTargetDoNotExist(self):
+        """Test that +o targeting a nonexistent channel and nickname
+        fails as expected."""
+        self.setupNicks()
+        # neither target channel nor target nick exist:
+        self.sendLine("chanop", "MODE #nonexistentchan +o nobody")
+        messages = self.getMessages("chanop")
+        self.assertEqual(len(messages), 1)
+        self.assertIn(
+            messages[0].command,
+            [ERR_NOSUCHCHANNEL, ERR_NOTONCHANNEL, ERR_USERNOTINCHANNEL],
+        )
+
+    @cases.mark_specifications("Modern")
+    def testChannelOperatorModeSenderNonMember(self):
+        """Test that +o where the sender is not a channel member
+        fails as expected."""
+        self.setupNicks()
+        # sender is not a channel member, target nick exists and is a channel member:
+        self.sendLine("chanop", "MODE #unrelated +o unprivileged")
+        messages = self.getMessages("chanop")
+        self.assertEqual(len(messages), 1)
+        self.assertIn(messages[0].command, [ERR_NOTONCHANNEL, ERR_CHANOPRIVSNEEDED])
+
+    @cases.mark_specifications("Modern")
+    def testChannelOperatorModeSenderAndTargetNonMembers(self):
+        """Test that +o where neither the sender nor the target is a channel
+        member fails as expected."""
+        self.setupNicks()
+        # sender is not a channel member, target nick exists but is not a channel member:
+        self.sendLine("chanop", "MODE #unrelated +o chanop")
+        messages = self.getMessages("chanop")
+        self.assertEqual(len(messages), 1)
+        self.assertIn(
+            messages[0].command,
+            [ERR_NOTONCHANNEL, ERR_CHANOPRIVSNEEDED, ERR_USERNOTINCHANNEL],
+        )
+
+    @cases.mark_specifications("Modern")
+    def testChannelOperatorModeSuccess(self):
+        """Tests a successful grant of +o in a channel."""
+        self.setupNicks()
+
+        self.sendLine("chanop", "MODE #chan +o unprivileged")
+        messages = self.getMessages("chanop")
+        self.assertEqual(len(messages), 1)
+        self.assertMessageMatch(
+            messages[0],
+            command="MODE",
+            params=["#chan", "+o", "unprivileged"],
+        )
+        messages = self.getMessages("unprivileged")
+        self.assertEqual(len(messages), 1)
+        self.assertMessageMatch(
+            messages[0],
+            command="MODE",
+            params=["#chan", "+o", "unprivileged"],
+        )

irctest/server_tests/join.py

@@ -200,3 +200,78 @@ class JoinTestCase(cases.BaseServerTestCase):
             fail_msg="Expected 1 error when joining channels '#valid' and 'inv@lid', "
             "got {got}",
         )
+
+    @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
+    def testJoinKey(self):
+        """Joins a single channel with a key"""
+        self.connectClient("chanop")
+        self.joinChannel(1, "#chan")
+        self.sendLine(1, "MODE #chan +k key")
+        self.getMessages(1)
+
+        self.connectClient("joiner")
+        self.sendLine(2, "JOIN #chan key")
+        self.assertMessageMatch(
+            self.getMessage(2),
+            command="JOIN",
+            params=["#chan"],
+        )
+
+    @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
+    def testJoinKeys(self):
+        """Joins two channels, both with keys"""
+        self.connectClient("chanop")
+        if self.targmax.get("JOIN", "1000") == "1":
+            raise runner.OptionalExtensionNotSupported("Multi-target JOIN")
+        self.joinChannel(1, "#chan1")
+        self.sendLine(1, "MODE #chan1 +k key1")
+        self.getMessages(1)
+        self.joinChannel(1, "#chan2")
+        self.sendLine(1, "MODE #chan2 +k key2")
+        self.getMessages(1)
+
+        self.connectClient("joiner")
+        self.sendLine(2, "JOIN #chan1,#chan2 key1,key2")
+        self.assertMessageMatch(
+            self.getMessage(2),
+            command="JOIN",
+            params=["#chan1"],
+        )
+        self.assertMessageMatch(
+            [
+                msg
+                for msg in self.getMessages(2)
+                if msg.command not in {RPL_NAMREPLY, RPL_ENDOFNAMES}
+            ][0],
+            command="JOIN",
+            params=["#chan2"],
+        )
+
+    @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
+    def testJoinManySingleKey(self):
+        """Joins two channels, the first one has a key."""
+        self.connectClient("chanop")
+        if self.targmax.get("JOIN", "1000") == "1":
+            raise runner.OptionalExtensionNotSupported("Multi-target JOIN")
+        self.joinChannel(1, "#chan1")
+        self.sendLine(1, "MODE #chan1 +k key1")
+        self.getMessages(1)
+        self.joinChannel(1, "#chan2")
+        self.getMessages(1)
+
+        self.connectClient("joiner")
+        self.sendLine(2, "JOIN #chan1,#chan2 key1")
+        self.assertMessageMatch(
+            self.getMessage(2),
+            command="JOIN",
+            params=["#chan1"],
+        )
+        self.assertMessageMatch(
+            [
+                msg
+                for msg in self.getMessages(2)
+                if msg.command not in {RPL_NAMREPLY, RPL_ENDOFNAMES}
+            ][0],
+            command="JOIN",
+            params=["#chan2"],
+        )

irctest/server_tests/links.py

@@ -3,6 +3,13 @@ from irctest.numerics import ERR_UNKNOWNCOMMAND, RPL_ENDOFLINKS, RPL_LINKS
 from irctest.patma import ANYSTR, StrRe
 
 
+def _server_info_regexp(case: cases.BaseServerTestCase) -> str:
+    if case.controller.software_name == "Sable":
+        return ".+"
+    else:
+        return "test server"
+
+
 class LinksTestCase(cases.BaseServerTestCase):
     @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
     def testLinksSingleServer(self):
@@ -56,7 +63,7 @@ class LinksTestCase(cases.BaseServerTestCase):
                 "nick",
                 "My.Little.Server",
                 "My.Little.Server",
-                StrRe("0 (0042 )?test server"),
+                StrRe(f"0 (0042 )?{_server_info_regexp(self)}"),
             ],
         )
 
@@ -119,7 +126,7 @@ class ServicesLinksTestCase(cases.BaseServerTestCase):
                 "nick",
                 "My.Little.Server",
                 "My.Little.Server",
-                StrRe("0 (0042 )?test server"),
+                StrRe(f"0 (0042 )?{_server_info_regexp(self)}"),
             ],
         )
         self.assertMessageMatch(
@@ -127,7 +134,7 @@ class ServicesLinksTestCase(cases.BaseServerTestCase):
             command=RPL_LINKS,
             params=[
                 "nick",
-                "services.example.org",
+                "My.Little.Services",
                 "My.Little.Server",
                 StrRe("1 .+"),  # SID instead of description for Anope...
             ],

irctest/server_tests/messages.py

@@ -140,9 +140,9 @@ class TagsTestCase(cases.BaseServerTestCase):
         self.joinChannel(1, "#xyz")
         monsterMessage = "@+clientOnlyTagExample=" + "a" * 4096 + " PRIVMSG #xyz hi!"
         self.sendLine(1, monsterMessage)
-        self.assertEqual(self.getMessages(2), [], "overflowing message was relayed")
         replies = self.getMessages(1)
         self.assertIn(ERR_INPUTTOOLONG, set(reply.command for reply in replies))
+        self.assertEqual(self.getMessages(2), [], "overflowing message was relayed")
 
 
 class LengthLimitTestCase(cases.BaseServerTestCase):

irctest/server_tests/multiline.py

@@ -3,7 +3,7 @@
 """
 
 from irctest import cases
-from irctest.patma import ANYDICT, StrRe
+from irctest.patma import ANYDICT, ANYSTR, StrRe
 
 CAP_NAME = "draft/multiline"
 BATCH_TYPE = "draft/multiline"
@@ -135,3 +135,86 @@ class MultilineTestCase(cases.BaseServerTestCase):
         self.assertIn("+client-only-tag", fallback_relay[0].tags)
         self.assertIn("+client-only-tag", fallback_relay[1].tags)
         self.assertEqual(fallback_relay[0].tags["msgid"], msgid)
+
+    @cases.mark_capabilities("draft/multiline")
+    def testInvalidBatchTag(self):
+        """Test that an unexpected change of batch tag results in
+        FAIL BATCH MULTILINE_INVALID."""
+
+        self.connectClient(
+            "alice", capabilities=(base_caps + [CAP_NAME]), skip_if_cap_nak=True
+        )
+        self.joinChannel(1, "#test")
+
+        # invalid batch tag:
+        self.sendLine(1, "BATCH +123 %s #test" % (BATCH_TYPE,))
+        self.sendLine(1, "@batch=231 PRIVMSG #test :hi")
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command="FAIL",
+            params=["BATCH", "MULTILINE_INVALID", ANYSTR],
+        )
+
+    @cases.mark_capabilities("draft/multiline")
+    def testInvalidBlankConcatTag(self):
+        """Test that the concat tag on a blank message results in
+        FAIL BATCH MULTILINE_INVALID."""
+
+        self.connectClient(
+            "alice", capabilities=(base_caps + [CAP_NAME]), skip_if_cap_nak=True
+        )
+        self.joinChannel(1, "#test")
+
+        # cannot send the concat tag with a blank message:
+        self.sendLine(1, "BATCH +123 %s #test" % (BATCH_TYPE,))
+        self.sendLine(1, "@batch=123 PRIVMSG #test :hi")
+        self.sendLine(1, "@batch=123;%s PRIVMSG #test :" % (CONCAT_TAG,))
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command="FAIL",
+            params=["BATCH", "MULTILINE_INVALID", ANYSTR],
+        )
+
+    @cases.mark_specifications("Ergo")
+    def testLineLimit(self):
+        """This is an Ergo-specific test for line limit enforcement
+        in multiline messages. Right now it hardcodes the same limits as in
+        the Ergo controller; we can generalize it in future for other multiline
+        implementations.
+        """
+
+        self.connectClient(
+            "alice", capabilities=(base_caps + [CAP_NAME]), skip_if_cap_nak=False
+        )
+        self.joinChannel(1, "#test")
+
+        # line limit exceeded
+        self.sendLine(1, "BATCH +123 %s #test" % (BATCH_TYPE,))
+        for i in range(33):
+            self.sendLine(1, "@batch=123 PRIVMSG #test hi")
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command="FAIL",
+            params=["BATCH", "MULTILINE_MAX_LINES", "32", ANYSTR],
+        )
+
+    @cases.mark_specifications("Ergo")
+    def testByteLimit(self):
+        """This is an Ergo-specific test for line limit enforcement
+        in multiline messages (see testLineLimit).
+        """
+
+        self.connectClient(
+            "alice", capabilities=(base_caps + [CAP_NAME]), skip_if_cap_nak=False
+        )
+        self.joinChannel(1, "#test")
+
+        # byte limit exceeded
+        self.sendLine(1, "BATCH +234 %s #test" % (BATCH_TYPE,))
+        for i in range(11):
+            self.sendLine(1, "@batch=234 PRIVMSG #test " + ("x" * 400))
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command="FAIL",
+            params=["BATCH", "MULTILINE_MAX_BYTES", "4096", ANYSTR],
+        )

irctest/server_tests/whois.py

@@ -221,7 +221,6 @@ class WhoisTestCase(_WhoisTestMixin, cases.BaseServerTestCase):
         )
 
     @cases.mark_specifications("RFC2812")
-    @cases.xfailIfSoftware(["Sable"], "https://github.com/Libera-Chat/sable/issues/101")
     def testWhoisMissingUser(self):
         """Test WHOIS on a nonexistent nickname."""
         self.connectClient("qux", name="qux")

make_workflows.py

@@ -65,7 +65,7 @@ def get_install_steps(*, software_config, software_id, version_flavor):
         install_steps = [
             {
                 "name": f"Checkout {name}",
-                "uses": "actions/checkout@v3",
+                "uses": "actions/checkout@v4",
                 "with": {
                     "repository": software_config["repository"],
                     "ref": ref,
@@ -94,7 +94,7 @@ def get_build_job(*, software_config, software_id, version_flavor):
         cache = [
             {
                 "name": "Cache dependencies",
-                "uses": "actions/cache@v3",
+                "uses": "actions/cache@v4",
                 "with": {
                     "path": f"~/.cache\n${{ github.workspace }}/{path}\n",
                     "key": "3-${{ runner.os }}-"
@@ -123,10 +123,10 @@ def get_build_job(*, software_config, software_id, version_flavor):
                 "run": "cd ~/; mkdir -p .local/ go/",
             },
             *cache,
-            {"uses": "actions/checkout@v3"},
+            {"uses": "actions/checkout@v4"},
             {
                 "name": "Set up Python 3.11",
-                "uses": "actions/setup-python@v4",
+                "uses": "actions/setup-python@v5",
                 "with": {"python-version": 3.11},
             },
             *install_steps,
@@ -160,7 +160,7 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
             downloads.append(
                 {
                     "name": "Download build artefacts",
-                    "uses": "actions/download-artifact@v3",
+                    "uses": "actions/download-artifact@v4",
                     "with": {"name": f"installed-{software_id}", "path": "~"},
                 }
             )
@@ -195,10 +195,10 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
         "runs-on": "ubuntu-22.04",
         "needs": needs,
         "steps": [
-            {"uses": "actions/checkout@v3"},
+            {"uses": "actions/checkout@v4"},
             {
                 "name": "Set up Python 3.11",
-                "uses": "actions/setup-python@v4",
+                "uses": "actions/setup-python@v5",
                 "with": {"python-version": 3.11},
             },
             *downloads,
@@ -223,6 +223,9 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
             {
                 "name": "Test with pytest",
                 "timeout-minutes": 30,
+                "env": {
+                    "IRCTEST_DEBUG_LOGS": "${{ runner.debug }}",
+                },
                 "run": (
                     f"PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' "
                     f"PATH=$HOME/.local/bin:$PATH "
@@ -232,7 +235,7 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
             {
                 "name": "Publish results",
                 "if": "always()",
-                "uses": "actions/upload-artifact@v3",
+                "uses": "actions/upload-artifact@v4",
                 "with": {
                     "name": f"pytest-results_{test_id}_{version_flavor.value}",
                     "path": "pytest.xml",
@@ -251,7 +254,7 @@ def upload_steps(software_id):
         },
         {
             "name": "Upload build artefacts",
-            "uses": "actions/upload-artifact@v3",
+            "uses": "actions/upload-artifact@v4",
             "with": {
                 "name": f"installed-{software_id}",
                 "path": "~/artefacts-*.tar.gz",
@@ -312,10 +315,10 @@ def generate_workflow(config: dict, version_flavor: VersionFlavor):
         # this job then
         "if": "success() || failure()",
         "steps": [
-            {"uses": "actions/checkout@v3"},
+            {"uses": "actions/checkout@v4"},
             {
                 "name": "Download Artifacts",
-                "uses": "actions/download-artifact@v3",
+                "uses": "actions/download-artifact@v4",
                 "with": {"path": "artifacts"},
             },
             {

patches/bahamut_localhost.patch

@@ -8,13 +8,13 @@ index 317b00e..adfcfcf 100644
  	    dots = 1;
  	}
  
--	if (!dots) 
+-	if (!dots)
 -        {
 -            sendto_realops("Invalid hostname for %s, dumping user %s",
 -                           sptr->hostip, sptr->name);
 -            return exit_client(cptr, sptr, &me, "Invalid hostname");
 -        }
--        
-         if (bad_dns) 
+-
+         if (bad_dns)
          {
              sendto_one(sptr, ":%s NOTICE %s :*** Notice -- You have a bad "

workflows.yml

@@ -97,7 +97,7 @@ software:
         name: Bahamut
         repository: DALnet/Bahamut
         refs:
-            stable: "v2.2.1"
+            stable: "v2.2.4"
             release: null
             devel: "master"
             devel_release: null
@@ -136,7 +136,7 @@ software:
         pre_deps:
             - uses: actions/setup-go@v3
               with:
-                  go-version: '^1.22.0'
+                  go-version: '^1.23.0'
             - run: go version
         separate_build_job: false
         build_script: |
@@ -148,7 +148,7 @@ software:
         name: InspIRCd
         repository: inspircd/inspircd
         refs: &inspircd_refs
-            stable: v3.17.0
+            stable: v3.17.1
             release: null
             devel: master
             devel_release: insp3
@@ -230,7 +230,7 @@ software:
         name: ngircd
         repository: ngircd/ngircd
         refs:
-            stable: 3e3f6cbeceefd9357b53b27c2386bb39306ab353 # three years ahead of rel-26.1
+            stable: acf8409c60ccc96beed0a1f990c4f9374823c0ce # three months ahead of v27
             release: null
             devel: master
             devel_release: null
@@ -249,7 +249,7 @@ software:
         name: Sable
         repository: Libera-Chat/sable
         refs:
-            stable: e9701e5e8d0c4f278ddd61ce7285f4918ecf99e9
+            stable: baed3ef9ac4550dc36a45b758436769e82e8ec58
             release: null
             devel: master
             devel_release: null
@@ -300,8 +300,8 @@ software:
         name: UnrealIRCd 6
         repository: unrealircd/unrealircd
         refs:
-            stable: da3c1c654481a33035b9c703957e1c25d0158259  # 6.0.7
-            release: da3c1c654481a33035b9c703957e1c25d0158259  # 6.0.7
+            stable: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
+            release: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
             devel: unreal60_dev
             devel_release: null
         path: unrealircd