Initialize MySQL

This starts each test with a clean database, so we can remove chan/nick
randomization from stateful tests (chathistory and roleplay).

It will also allow testing Ergo with a MySQL backend for the KV store
instead of buntdb.

Additionally, this makes it much easier to run these tests, than having
to manually configure such a database.

.github/workflows/test-devel.yml

@@ -5,22 +5,18 @@ jobs:
   build-anope:
     runs-on: ubuntu-latest
     steps:
+    - uses: actions/checkout@v2
     - name: Create directories
       run: cd ~/; mkdir -p .local/ go/
-    - name: Cache dependencies
+    - name: Cache Anope
       uses: actions/cache@v2
       with:
-        key: 3-${{ runner.os }}-anope-devel
+        key: 3-${{ runner.os }}-anope-2.0.9
         path: '~/.cache
 
-          ${ github.workspace }/anope
+          ${{ github.workspace }}/anope
 
           '
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
     - name: Checkout Anope
       uses: actions/checkout@v2
       with:
@@ -28,7 +24,7 @@ jobs:
         ref: 2.0.9
         repository: anope/anope
     - name: Build Anope
-      run: |
+      run: |-
         cd $GITHUB_WORKSPACE/anope/
         cp $GITHUB_WORKSPACE/data/anope/* .
         CFLAGS=-O0 ./Config -quick
@@ -71,7 +67,6 @@ jobs:
       run: |
         cd $GITHUB_WORKSPACE/Bahamut/
         patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch
-        patch src/s_bsd.c < $GITHUB_WORKSPACE/patches/bahamut_mainloop.patch
         echo "#undef THROTTLE_ENABLE" >> include/config.h
         libtoolize --force
         aclocal
@@ -400,7 +395,6 @@ jobs:
     - test-unrealircd-5
     - test-unrealircd-anope
     - test-unrealircd-atheme
-    - test-unrealircd-dlk
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -547,7 +541,7 @@ jobs:
         repository: ergochat/ergo
     - uses: actions/setup-go@v2
       with:
-        go-version: ^1.19.0
+        go-version: ^1.18.0
     - run: go version
     - name: Build Ergo
       run: |
@@ -1128,52 +1122,6 @@ jobs:
       with:
         name: pytest-results_unrealircd-atheme_devel
         path: pytest.xml
-  test-unrealircd-dlk:
-    needs:
-    - build-unrealircd
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - name: Download build artefacts
-      uses: actions/download-artifact@v2
-      with:
-        name: installed-unrealircd
-        path: '~'
-    - name: Unpack artefacts
-      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
-    - name: Checkout Dlk
-      uses: actions/checkout@v2
-      with:
-        path: Dlk-Services
-        ref: main
-        repository: DalekIRC/Dalek-Services
-    - name: Build Dlk
-      run: |
-        pip install pifpaf
-        wget -q https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
-        wget -q https://wordpress.org/latest.zip -O wordpress-latest.zip
-    - name: Install system dependencies
-      run: sudo apt-get install atheme-services faketime
-    - name: Install irctest dependencies
-      run: |-
-        python -m pip install --upgrade pip
-        pip install pytest pytest-xdist -r requirements.txt
-    - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
-        IRCTEST_DLK_PATH="${{ github.workspace }}/Dlk-Services" IRCTEST_WP_CLI_PATH="${{
-        github.workspace }}/wp-cli.phar" IRCTEST_WP_ZIP_PATH="${{ github.workspace
-        }}/wordpress-latest.zip" make unrealircd-dlk
-      timeout-minutes: 30
-    - if: always()
-      name: Publish results
-      uses: actions/upload-artifact@v2
-      with:
-        name: pytest-results_unrealircd-dlk_devel
-        path: pytest.xml
 name: irctest with devel versions
 'on':
   schedule:

.github/workflows/test-devel_release.yml

@@ -5,22 +5,18 @@ jobs:
   build-anope:
     runs-on: ubuntu-latest
     steps:
+    - uses: actions/checkout@v2
     - name: Create directories
       run: cd ~/; mkdir -p .local/ go/
-    - name: Cache dependencies
+    - name: Cache Anope
       uses: actions/cache@v2
       with:
-        key: 3-${{ runner.os }}-anope-devel_release
+        key: 3-${{ runner.os }}-anope-2.0.9
         path: '~/.cache
 
-          ${ github.workspace }/anope
+          ${{ github.workspace }}/anope
 
           '
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
     - name: Checkout Anope
       uses: actions/checkout@v2
       with:
@@ -28,7 +24,7 @@ jobs:
         ref: 2.0.9
         repository: anope/anope
     - name: Build Anope
-      run: |
+      run: |-
         cd $GITHUB_WORKSPACE/anope/
         cp $GITHUB_WORKSPACE/data/anope/* .
         CFLAGS=-O0 ./Config -quick

.github/workflows/test-stable.yml

@@ -5,22 +5,18 @@ jobs:
   build-anope:
     runs-on: ubuntu-latest
     steps:
+    - uses: actions/checkout@v2
     - name: Create directories
       run: cd ~/; mkdir -p .local/ go/
-    - name: Cache dependencies
+    - name: Cache Anope
       uses: actions/cache@v2
       with:
-        key: 3-${{ runner.os }}-anope-stable
+        key: 3-${{ runner.os }}-anope-2.0.9
         path: '~/.cache
 
-          ${ github.workspace }/anope
+          ${{ github.workspace }}/anope
 
           '
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
     - name: Checkout Anope
       uses: actions/checkout@v2
       with:
@@ -28,7 +24,7 @@ jobs:
         ref: 2.0.9
         repository: anope/anope
     - name: Build Anope
-      run: |
+      run: |-
         cd $GITHUB_WORKSPACE/anope/
         cp $GITHUB_WORKSPACE/data/anope/* .
         CFLAGS=-O0 ./Config -quick
@@ -71,7 +67,6 @@ jobs:
       run: |
         cd $GITHUB_WORKSPACE/Bahamut/
         patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch
-        patch src/s_bsd.c < $GITHUB_WORKSPACE/patches/bahamut_mainloop.patch
         echo "#undef THROTTLE_ENABLE" >> include/config.h
         libtoolize --force
         aclocal
@@ -443,7 +438,6 @@ jobs:
     - test-unrealircd-5
     - test-unrealircd-anope
     - test-unrealircd-atheme
-    - test-unrealircd-dlk
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -623,7 +617,7 @@ jobs:
         repository: ergochat/ergo
     - uses: actions/setup-go@v2
       with:
-        go-version: ^1.19.0
+        go-version: ^1.18.0
     - run: go version
     - name: Build Ergo
       run: |
@@ -1286,52 +1280,6 @@ jobs:
       with:
         name: pytest-results_unrealircd-atheme_stable
         path: pytest.xml
-  test-unrealircd-dlk:
-    needs:
-    - build-unrealircd
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - name: Download build artefacts
-      uses: actions/download-artifact@v2
-      with:
-        name: installed-unrealircd
-        path: '~'
-    - name: Unpack artefacts
-      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
-    - name: Checkout Dlk
-      uses: actions/checkout@v2
-      with:
-        path: Dlk-Services
-        ref: effd18652fc1c847d1959089d9cca9ff9837a8c0
-        repository: DalekIRC/Dalek-Services
-    - name: Build Dlk
-      run: |
-        pip install pifpaf
-        wget -q https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
-        wget -q https://wordpress.org/latest.zip -O wordpress-latest.zip
-    - name: Install system dependencies
-      run: sudo apt-get install atheme-services faketime
-    - name: Install irctest dependencies
-      run: |-
-        python -m pip install --upgrade pip
-        pip install pytest pytest-xdist -r requirements.txt
-    - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
-        IRCTEST_DLK_PATH="${{ github.workspace }}/Dlk-Services" IRCTEST_WP_CLI_PATH="${{
-        github.workspace }}/wp-cli.phar" IRCTEST_WP_ZIP_PATH="${{ github.workspace
-        }}/wordpress-latest.zip" make unrealircd-dlk
-      timeout-minutes: 30
-    - if: always()
-      name: Publish results
-      uses: actions/upload-artifact@v2
-      with:
-        name: pytest-results_unrealircd-dlk_stable
-        path: pytest.xml
 name: irctest with stable versions
 'on':
   pull_request: null

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
       - id: isort
 
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 5.0.4
+    rev: 3.8.3
     hooks:
       - id: flake8
 

Makefile

@@ -122,8 +122,7 @@ bahamut:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller=irctest.controllers.bahamut \
 		-m 'not services' \
-		-n 4 \
-		-vv -s \
+		-n 10 \
 		-k '$(BAHAMUT_SELECTORS)'
 
 bahamut-atheme:
@@ -131,6 +130,7 @@ bahamut-atheme:
 		--controller=irctest.controllers.bahamut \
 		--services-controller=irctest.controllers.atheme_services \
 		-m 'services' \
+		-n 10 \
 		-k '$(BAHAMUT_SELECTORS)'
 
 bahamut-anope:
@@ -138,6 +138,7 @@ bahamut-anope:
 		--controller=irctest.controllers.bahamut \
 		--services-controller=irctest.controllers.anope_services \
 		-m 'services' \
+		-n 10 \
 		-k '$(BAHAMUT_SELECTORS)'
 
 charybdis:
@@ -181,28 +182,28 @@ ircu2:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller=irctest.controllers.ircu2 \
 		-m 'not services and not IRCv3' \
-		-n 4 \
+		-n 10 \
 		-k '$(IRCU2_SELECTORS)'
 
 nefarious:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller=irctest.controllers.nefarious \
 		-m 'not services' \
-		-n 4 \
+		-n 10 \
 		-k '$(NEFARIOUS_SELECTORS)'
 
 snircd:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller=irctest.controllers.snircd \
 		-m 'not services and not IRCv3' \
-		-n 4 \
+		-n 10 \
 		-k '$(SNIRCD_SELECTORS)'
 
 irc2:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller=irctest.controllers.irc2 \
 		-m 'not services and not IRCv3' \
-		-n 4 \
+		-n 10 \
 		-k '$(IRC2_SELECTORS)'
 
 limnoria:
@@ -225,7 +226,7 @@ ngircd:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller irctest.controllers.ngircd \
 		-m 'not services' \
-		-n 4 \
+		-n 10 \
 		-k "$(NGIRCD_SELECTORS)"
 
 ngircd-anope:
@@ -274,10 +275,3 @@ unrealircd-anope:
 		--services-controller=irctest.controllers.anope_services \
 		-m 'services' \
 		-k '$(UNREALIRCD_SELECTORS)'
-
-unrealircd-dlk:
-	pifpaf run mysql -- $(PYTEST) $(PYTEST_ARGS) \
-		--controller=irctest.controllers.unrealircd \
-		--services-controller=irctest.controllers.dlk_services \
-		-m 'services' \
-		-k '$(UNREALIRCD_SELECTORS)'

README.md

@@ -23,6 +23,7 @@ cd ~
 git clone https://github.com/ProgVal/irctest.git
 cd irctest
 pip3 install --user -r requirements.txt
+python3 setup.py install --user
 ```
 
 Add `~/.local/bin/` (and/or `~/go/bin/` for Ergo)

irctest/basecontrollers.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import dataclasses
 import os
-from pathlib import Path
 import shutil
 import socket
 import subprocess
@@ -88,7 +87,7 @@ class DirectoryBasedController(_BaseController):
     """Helper for controllers whose software configuration is based on an
     arbitrary directory."""
 
-    directory: Optional[Path]
+    directory: Optional[str]
 
     def __init__(self, test_config: TestCaseControllerConfig):
         super().__init__(test_config)
@@ -111,21 +110,22 @@ class DirectoryBasedController(_BaseController):
         """Open a file in the configuration directory."""
         assert self.directory
         if os.sep in name:
-            dir_ = self.directory / os.path.dirname(name)
-            dir_.mkdir(parents=True, exist_ok=True)
-            assert dir_.is_dir()
-        return (self.directory / name).open(mode)
+            dir_ = os.path.join(self.directory, os.path.dirname(name))
+            if not os.path.isdir(dir_):
+                os.makedirs(dir_)
+            assert os.path.isdir(dir_)
+        return open(os.path.join(self.directory, name), mode)
 
     def create_config(self) -> None:
         if not self.directory:
-            self.directory = Path(tempfile.mkdtemp())
+            self.directory = tempfile.mkdtemp()
 
     def gen_ssl(self) -> None:
         assert self.directory
-        self.csr_path = self.directory / "ssl.csr"
-        self.key_path = self.directory / "ssl.key"
-        self.pem_path = self.directory / "ssl.pem"
-        self.dh_path = self.directory / "dh.pem"
+        self.csr_path = os.path.join(self.directory, "ssl.csr")
+        self.key_path = os.path.join(self.directory, "ssl.key")
+        self.pem_path = os.path.join(self.directory, "ssl.pem")
+        self.dh_path = os.path.join(self.directory, "dh.pem")
         subprocess.check_output(
             [
                 self.openssl_bin,
@@ -222,7 +222,6 @@ class BaseServerController(_BaseController):
             raise NotImplementedByController("account registration")
 
     def wait_for_port(self) -> None:
-        started_at = time.time()
         while not self.port_open:
             self.check_is_alive()
             time.sleep(self._port_wait_interval)
@@ -245,16 +244,11 @@ class BaseServerController(_BaseController):
                     # ircu2 cuts the connection without a message if registration
                     # is not complete.
                     pass
-                except socket.timeout:
-                    # irc2 just keeps it open
-                    pass
 
                 c.close()
                 self.port_open = True
-            except ConnectionRefusedError:
-                if time.time() - started_at >= 60:
-                    # waited for 60 seconds, giving up
-                    raise
+            except Exception:
+                continue
 
     def wait_for_services(self) -> None:
         assert self.services_controller
@@ -301,11 +295,10 @@ class BaseServicesController(_BaseController):
                 c.sendLine("PONG :" + msg.params[0])
         c.getMessages()
 
-        timeout = time.time() + 3
+        timeout = time.time() + 5
         while True:
-            c.sendLine(f"PRIVMSG {self.server_controller.nickserv} :help")
-
-            msgs = self.getNickServResponse(c, timeout=1)
+            c.sendLine(f"PRIVMSG {self.server_controller.nickserv} :HELP")
+            msgs = self.getNickServResponse(c)
             for msg in msgs:
                 if msg.command == "401":
                     # NickServ not available yet
@@ -331,12 +324,11 @@ class BaseServicesController(_BaseController):
         c.disconnect()
         self.services_up = True
 
-    def getNickServResponse(self, client: Any, timeout: int = 0) -> List[Message]:
+    def getNickServResponse(self, client: Any) -> List[Message]:
         """Wrapper aroung getMessages() that waits longer, because NickServ
         is queried asynchronously."""
         msgs: List[Message] = []
-        start_time = time.time()
-        while not msgs and (not timeout or start_time + timeout > time.time()):
+        while not msgs:
             time.sleep(0.05)
             msgs = client.getMessages()
         return msgs

irctest/controllers/anope_services.py

@@ -1,4 +1,4 @@
-from pathlib import Path
+import os
 import shutil
 import subprocess
 from typing import Type
@@ -101,11 +101,14 @@ class AnopeController(BaseServicesController, DirectoryBasedController):
             pass
 
         assert self.directory
-        services_path = shutil.which("services")
-        assert services_path
 
         # Config and code need to be in the same directory, *obviously*
-        (self.directory / "lib").symlink_to(Path(services_path).parent.parent / "lib")
+        os.symlink(
+            os.path.join(
+                os.path.dirname(shutil.which("services")), "..", "lib"  # type: ignore
+            ),
+            os.path.join(self.directory, "lib"),
+        )
 
         self.proc = subprocess.Popen(
             [

irctest/controllers/atheme_services.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 from typing import Optional, Type
 
@@ -80,11 +81,11 @@ class AthemeController(BaseServicesController, DirectoryBasedController):
                 "atheme-services",
                 "-n",  # don't fork
                 "-c",
-                self.directory / "services.conf",
+                os.path.join(self.directory, "services.conf"),
                 "-l",
                 f"/tmp/services-{server_port}.log",
                 "-p",
-                self.directory / "services.pid",
+                os.path.join(self.directory, "services.pid"),
                 "-D",
                 self.directory,
             ],

irctest/controllers/bahamut.py

@@ -1,4 +1,4 @@
-from pathlib import Path
+import os
 import shutil
 import subprocess
 from typing import Optional, Set, Type
@@ -80,19 +80,6 @@ oper {{
 """
 
 
-def initialize_entropy(directory: Path) -> None:
-    # https://github.com/DALnet/bahamut/blob/7fc039d403f66a954225c5dc4ad1fe683aedd794/include/dh.h#L35-L38
-    nb_rand_bytes = 512 // 8
-    # https://github.com/DALnet/bahamut/blob/7fc039d403f66a954225c5dc4ad1fe683aedd794/src/dh.c#L186
-    entropy_file_size = nb_rand_bytes * 4
-
-    # Not actually random; but we don't care.
-    entropy = b"\x00" * entropy_file_size
-
-    with (directory / ".ircd.entropy").open("wb") as fd:
-        fd.write(entropy)
-
-
 class BahamutController(BaseServerController, DirectoryBasedController):
     software_name = "Bahamut"
     supported_sasl_mechanisms: Set[str] = set()
@@ -134,14 +121,9 @@ class BahamutController(BaseServerController, DirectoryBasedController):
 
         assert self.directory
 
-        # Bahamut reads some bytes from /dev/urandom on startup, which causes
-        # GitHub Actions to sometimes freeze and timeout.
-        # This initializes the entropy file so Bahamut does not need to do it itself.
-        initialize_entropy(self.directory)
-
         # they are hardcoded... thankfully Bahamut reads them from the CWD.
-        shutil.copy(self.pem_path, self.directory / "ircd.crt")
-        shutil.copy(self.key_path, self.directory / "ircd.key")
+        shutil.copy(self.pem_path, os.path.join(self.directory, "ircd.crt"))
+        shutil.copy(self.key_path, os.path.join(self.directory, "ircd.key"))
 
         with self.open_file("server.conf") as fd:
             fd.write(
@@ -168,7 +150,7 @@ class BahamutController(BaseServerController, DirectoryBasedController):
                 "ircd",
                 "-t",  # don't fork
                 "-f",
-                self.directory / "server.conf",
+                os.path.join(self.directory, "server.conf"),
             ],
         )
 

irctest/controllers/base_hybrid.py

@@ -1,3 +1,4 @@
+import os
 import shutil
 import subprocess
 from typing import Optional, Set
@@ -87,9 +88,9 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
                 self.binary_name,
                 "-foreground",
                 "-configfile",
-                self.directory / "server.conf",
+                os.path.join(self.directory, "server.conf"),
                 "-pidfile",
-                self.directory / "server.pid",
+                os.path.join(self.directory, "server.pid"),
             ],
             # stderr=subprocess.DEVNULL,
         )

irctest/controllers/dlk_services.py

@@ -1,245 +0,0 @@
-import os
-from pathlib import Path
-import secrets
-import subprocess
-from typing import Optional, Type
-
-import irctest
-from irctest.basecontrollers import BaseServicesController, DirectoryBasedController
-import irctest.cases
-import irctest.runner
-
-TEMPLATE_DLK_CONFIG = """\
-info {{
-    SID "00A";
-    network-name "testnetwork";
-    services-name "services.example.org";
-    admin-email "admin@example.org";
-}}
-
-link {{
-    hostname "{server_hostname}";
-    port "{server_port}";
-    password "password";
-}}
-
-log {{
-    debug "yes";
-}}
-
-sql {{
-    port "3306";
-    username "pifpaf";
-    password "pifpaf";
-    database "pifpaf";
-    sockfile "{mysql_socket}";
-    prefix "{dlk_prefix}";
-}}
-
-wordpress {{
-    prefix "{wp_prefix}";
-}}
-
-"""
-
-TEMPLATE_DLK_WP_CONFIG = """
-<?php
-
-global $wpconfig;
-$wpconfig = [
-
-    "dbprefix" => "{wp_prefix}",
-
-
-    "default_avatar" => "https://valware.uk/wp-content/plugins/ultimate-member/assets/img/default_avatar.jpg",
-    "forumschan" => "#DLK-Support",
-
-];
-"""
-
-TEMPLATE_WP_CONFIG = """
-define( 'DB_NAME', 'pifpaf' );
-define( 'DB_USER', 'pifpaf' );
-define( 'DB_PASSWORD', 'pifpaf' );
-define( 'DB_HOST', 'localhost:{mysql_socket}' );
-define( 'DB_CHARSET', 'utf8' );
-define( 'DB_COLLATE', '' );
-
-define( 'AUTH_KEY',         'put your unique phrase here' );
-define( 'SECURE_AUTH_KEY',  'put your unique phrase here' );
-define( 'LOGGED_IN_KEY',    'put your unique phrase here' );
-define( 'NONCE_KEY',        'put your unique phrase here' );
-define( 'AUTH_SALT',        'put your unique phrase here' );
-define( 'SECURE_AUTH_SALT', 'put your unique phrase here' );
-define( 'LOGGED_IN_SALT',   'put your unique phrase here' );
-define( 'NONCE_SALT',       'put your unique phrase here' );
-
-$table_prefix = '{wp_prefix}';
-
-define( 'WP_DEBUG', false );
-
-if (!defined('ABSPATH')) {{
-    define( 'ABSPATH', '{wp_path}' );
-}}
-
-/* That's all, stop editing! Happy publishing. */
-
-/** Absolute path to the WordPress directory. */
-
-
-/** Sets up WordPress vars and included files. */
-require_once ABSPATH . 'wp-settings.php';
-"""
-
-
-class DlkController(BaseServicesController, DirectoryBasedController):
-    """Mixin for server controllers that rely on DLK"""
-
-    software_name = "Dlk-Services"
-
-    def run_sql(self, sql: str) -> None:
-        mysql_socket = os.environ["PIFPAF_MYSQL_SOCKET"]
-        subprocess.run(
-            ["mysql", "-S", mysql_socket, "pifpaf"],
-            input=sql.encode(),
-            check=True,
-        )
-
-    def run(self, protocol: str, server_hostname: str, server_port: int) -> None:
-        self.create_config()
-
-        if protocol == "unreal4":
-            protocol = "unreal5"
-        assert protocol in ("unreal5",), protocol
-
-        mysql_socket = os.environ["PIFPAF_MYSQL_SOCKET"]
-
-        assert self.directory
-
-        try:
-            self.wp_cli_path = Path(os.environ["IRCTEST_WP_CLI_PATH"])
-            if not self.wp_cli_path.is_file():
-                raise KeyError()
-        except KeyError:
-            raise RuntimeError(
-                "$IRCTEST_WP_CLI_PATH must be set to a WP-CLI executable (eg. "
-                "downloaded from <https://raw.githubusercontent.com/wp-cli/builds/"
-                "gh-pages/phar/wp-cli.phar>)"
-            ) from None
-
-        try:
-            self.dlk_path = Path(os.environ["IRCTEST_DLK_PATH"])
-            if not self.dlk_path.is_dir():
-                raise KeyError()
-        except KeyError:
-            raise RuntimeError("$IRCTEST_DLK_PATH is not set") from None
-        self.dlk_path = self.dlk_path.resolve()
-
-        # Unpack a fresh Wordpress install in the temporary directory.
-        # In theory we could have a common Wordpress install and only wp-config.php
-        # in the temporary directory; but wp-cli assumes wp-config.php must be
-        # in a Wordpress directory, and fails in various places if it isn't.
-        # Rather than symlinking everything to make it work, let's just copy
-        # the whole code, it's not that big.
-        try:
-            wp_zip_path = Path(os.environ["IRCTEST_WP_ZIP_PATH"])
-            if not wp_zip_path.is_file():
-                raise KeyError()
-        except KeyError:
-            raise RuntimeError(
-                "$IRCTEST_WP_ZIP_PATH must be set to a Wordpress source zipball "
-                "(eg. downloaded from <https://wordpress.org/latest.zip>)"
-            ) from None
-        subprocess.run(
-            ["unzip", wp_zip_path, "-d", self.directory], stdout=subprocess.DEVNULL
-        )
-        self.wp_path = self.directory / "wordpress"
-
-        rand_hex = secrets.token_hex(6)
-        self.wp_prefix = f"wp{rand_hex}_"
-        self.dlk_prefix = f"dlk{rand_hex}_"
-        template_vars = dict(
-            protocol=protocol,
-            server_hostname=server_hostname,
-            server_port=server_port,
-            mysql_socket=mysql_socket,
-            wp_path=self.wp_path,
-            wp_prefix=self.wp_prefix,
-            dlk_prefix=self.dlk_prefix,
-        )
-
-        # Configure Wordpress
-        wp_config_path = self.directory / "wp-config.php"
-        with open(wp_config_path, "w") as fd:
-            fd.write(TEMPLATE_WP_CONFIG.format(**template_vars))
-
-        subprocess.run(
-            [
-                "php",
-                self.wp_cli_path,
-                "core",
-                "install",
-                "--url=http://localhost/",
-                "--title=irctest site",
-                "--admin_user=adminuser",
-                "--admin_email=adminuser@example.org",
-                f"--path={self.wp_path}",
-            ],
-            check=True,
-        )
-
-        # Configure Dlk
-        dlk_log_dir = self.directory / "logs"
-        dlk_conf_dir = self.directory / "conf"
-        dlk_conf_path = dlk_conf_dir / "dalek.conf"
-        os.mkdir(dlk_conf_dir)
-        with open(dlk_conf_path, "w") as fd:
-            fd.write(TEMPLATE_DLK_CONFIG.format(**template_vars))
-        dlk_wp_config_path = dlk_conf_dir / "wordpress.conf"
-        with open(dlk_wp_config_path, "w") as fd:
-            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(
-            [
-                "php",
-                "src/dalek",
-            ],
-            cwd=self.dlk_path,
-            env={
-                **os.environ,
-                "DALEK_CONF_DIR": str(dlk_conf_dir),
-                "DALEK_LOG_DIR": str(dlk_log_dir),
-            },
-        )
-
-    def terminate(self) -> None:
-        super().terminate()
-
-    def kill(self) -> None:
-        super().kill()
-
-    def registerUser(
-        self,
-        case: irctest.cases.BaseServerTestCase,
-        username: str,
-        password: Optional[str] = None,
-    ) -> None:
-        assert password
-        subprocess.run(
-            [
-                "php",
-                self.wp_cli_path,
-                "user",
-                "create",
-                username,
-                f"{username}@example.org",
-                f"--user_pass={password}",
-                f"--path={self.wp_path}",
-            ],
-            check=True,
-        )
-
-
-def get_irctest_controller_class() -> Type[DlkController]:
-    return DlkController

irctest/controllers/ergo.py

@@ -3,7 +3,7 @@ import json
 import os
 import shutil
 import subprocess
-from typing import Any, Dict, Optional, Set, Type, Union
+from typing import Any, Dict, List, Optional, Set, Type, Union
 
 from irctest.basecontrollers import (
     BaseServerController,
@@ -139,6 +139,7 @@ class ErgoController(BaseServerController, DirectoryBasedController):
     supported_sasl_mechanisms = {"PLAIN", "SCRAM-SHA-256"}
     supports_sts = True
     extban_mute_char = "m"
+    mysql_proc: Optional[subprocess.Popen] = None
 
     def create_config(self) -> None:
         super().create_config()
@@ -173,7 +174,7 @@ class ErgoController(BaseServerController, DirectoryBasedController):
         enable_chathistory = self.test_config.chathistory
         enable_roleplay = self.test_config.ergo_roleplay
         if enable_chathistory or enable_roleplay:
-            config = self.addMysqlToConfig(config)
+            self.addDatabaseToConfig(config)
 
         if enable_roleplay:
             config["roleplay"] = {"enabled": True}
@@ -185,19 +186,21 @@ class ErgoController(BaseServerController, DirectoryBasedController):
         bind_address = "127.0.0.1:%s" % (port,)
         listener_conf = None  # plaintext
         if ssl:
-            self.key_path = self.directory / "ssl.key"
-            self.pem_path = self.directory / "ssl.pem"
+            self.key_path = os.path.join(self.directory, "ssl.key")
+            self.pem_path = os.path.join(self.directory, "ssl.pem")
             listener_conf = {"tls": {"cert": self.pem_path, "key": self.key_path}}
         config["server"]["listeners"][bind_address] = listener_conf  # type: ignore
 
-        config["datastore"]["path"] = str(self.directory / "ircd.db")  # type: ignore
+        config["datastore"]["path"] = os.path.join(  # type: ignore
+            self.directory, "ircd.db"
+        )
 
         if password is not None:
             config["server"]["password"] = hash_password(password)  # type: ignore
 
         assert self.proc is None
 
-        self._config_path = self.directory / "server.yml"
+        self._config_path = os.path.join(self.directory, "server.yml")
         self._config = config
         self._write_config()
         subprocess.call(["ergo", "initdb", "--conf", self._config_path, "--quiet"])
@@ -213,6 +216,16 @@ class ErgoController(BaseServerController, DirectoryBasedController):
             [*faketime_cmd, "ergo", "run", "--conf", self._config_path, "--quiet"]
         )
 
+    def terminate(self) -> None:
+        if self.mysql_proc is not None:
+            self.mysql_proc.terminate()
+        super().terminate()
+
+    def kill(self) -> None:
+        if self.mysql_proc is not None:
+            self.mysql_proc.kill()
+        super().kill()
+
     def wait_for_services(self) -> None:
         # Nothing to wait for, they start at the same time as Ergo.
         pass
@@ -264,32 +277,107 @@ class ErgoController(BaseServerController, DirectoryBasedController):
         config.update(LOGGING_CONFIG)
         return config
 
-    def addMysqlToConfig(self, config: Optional[Dict] = None) -> Dict:
-        mysql_password = os.getenv("MYSQL_PASSWORD")
-        if config is None:
-            config = self.baseConfig()
-        if not mysql_password:
-            return config
-        config["datastore"]["mysql"] = {
-            "enabled": True,
-            "host": "localhost",
-            "user": "ergo",
-            "password": mysql_password,
-            "history-database": "ergo_history",
-            "timeout": "3s",
-        }
-        config["accounts"]["multiclient"] = {
-            "enabled": True,
-            "allowed-by-default": True,
-            "always-on": "disabled",
-        }
-        config["history"]["persistent"] = {
-            "enabled": True,
-            "unregistered-channels": True,
-            "registered-channels": "opt-out",
-            "direct-messages": "opt-out",
-        }
-        return config
+    def addDatabaseToConfig(self, config: Dict) -> None:
+        history_backend = os.environ.get("ERGO_HISTORY_BACKEND", "memory")
+        if history_backend == "memory":
+            # nothing to do, this is the default
+            pass
+        elif history_backend == "mysql":
+            socket_path = self.startMysql()
+            self.createMysqlDatabase(socket_path, "ergo_history")
+            config["datastore"]["mysql"] = {
+                "enabled": True,
+                "socket-path": socket_path,
+                "history-database": "ergo_history",
+                "timeout": "3s",
+            }
+            config["history"]["persistent"] = {
+                "enabled": True,
+                "unregistered-channels": True,
+                "registered-channels": "opt-out",
+                "direct-messages": "opt-out",
+            }
+        else:
+            raise ValueError(
+                f"Invalid $ERGO_HISTORY_BACKEND value: {history_backend}. "
+                f"It should be 'memory' (the default) or 'mysql'"
+            )
+
+    def startMysql(self) -> str:
+        """Starts a new MySQL server listening on a UNIX socket, returns the socket
+        path"""
+        # Function based on pifpaf's MySQL driver:
+        # https://github.com/jd/pifpaf/blob/3.1.5/pifpaf/drivers/mysql.py
+        assert self.directory
+        mysql_dir = os.path.join(self.directory, "mysql")
+        socket_path = os.path.join(mysql_dir, "mysql.socket")
+        os.mkdir(mysql_dir)
+
+        print("Starting MySQL...")
+        try:
+            subprocess.check_call(
+                [
+                    "mysqld",
+                    "--no-defaults",
+                    "--tmpdir=" + mysql_dir,
+                    "--initialize-insecure",
+                    "--datadir=" + mysql_dir,
+                ],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+            )
+        except subprocess.CalledProcessError:
+            # Initialize the old way
+            subprocess.check_call(
+                [
+                    "mysql_install_db",
+                    "--no-defaults",
+                    "--tmpdir=" + mysql_dir,
+                    "--datadir=" + mysql_dir,
+                ],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+            )
+        self.mysql_proc = subprocess.Popen(
+            [
+                "mysqld",
+                "--no-defaults",
+                "--tmpdir=" + mysql_dir,
+                "--datadir=" + mysql_dir,
+                "--socket=" + socket_path,
+                "--skip-networking",
+                "--skip-grant-tables",
+            ],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+        )
+
+        mysql_stdout = self.mysql_proc.stdout
+        assert mysql_stdout is not None  # for mypy...
+        lines: List[bytes] = []
+        while self.mysql_proc.returncode is None:
+            line = mysql_stdout.readline()
+            lines.append(lines)
+            if b"mysqld: ready for connections." in line:
+                break
+        assert self.mysql_proc.returncode is None, (
+            "MySQL unexpected stopped: " + b"\n".join(lines).decode()
+        )
+        print("MySQL started")
+
+        return socket_path
+
+    def createMysqlDatabase(self, socket_path: str, database_name: str) -> None:
+        subprocess.check_call(
+            [
+                "mysql",
+                "--no-defaults",
+                "-S",
+                socket_path,
+                "-e",
+                f"CREATE DATABASE {database_name};",
+            ]
+        )
 
     def rehash(self, case: BaseServerTestCase, config: Dict) -> None:
         self._config = config

irctest/controllers/inspircd.py

@@ -1,3 +1,4 @@
+import os
 import shutil
 import subprocess
 from typing import Optional, Set, Type
@@ -163,7 +164,7 @@ class InspircdController(BaseServerController, DirectoryBasedController):
                 "inspircd",
                 "--nofork",
                 "--config",
-                self.directory / "server.conf",
+                os.path.join(self.directory, "server.conf"),
             ],
             stdout=subprocess.DEVNULL,
         )

irctest/controllers/irc2.py

@@ -1,3 +1,4 @@
+import os
 import shutil
 import subprocess
 from typing import Optional, Set, Type
@@ -67,7 +68,7 @@ class Irc2Controller(BaseServerController, DirectoryBasedController):
         self.create_config()
         password_field = password if password else ""
         assert self.directory
-        pidfile = self.directory / "ircd.pid"
+        pidfile = os.path.join(self.directory, "ircd.pid")
         with self.open_file("server.conf") as fd:
             fd.write(
                 TEMPLATE_CONFIG.format(
@@ -92,7 +93,7 @@ class Irc2Controller(BaseServerController, DirectoryBasedController):
                 "-p",
                 "on",
                 "-f",
-                self.directory / "server.conf",
+                os.path.join(self.directory, "server.conf"),
             ],
             # stderr=subprocess.DEVNULL,
         )

irctest/controllers/ircu2.py

@@ -1,3 +1,4 @@
+import os
 import shutil
 import subprocess
 from typing import Optional, Set, Type
@@ -86,7 +87,7 @@ class Ircu2Controller(BaseServerController, DirectoryBasedController):
         self.create_config()
         password_field = 'password = "{}";'.format(password) if password else ""
         assert self.directory
-        pidfile = self.directory / "ircd.pid"
+        pidfile = os.path.join(self.directory, "ircd.pid")
         with self.open_file("server.conf") as fd:
             fd.write(
                 TEMPLATE_CONFIG.format(
@@ -109,7 +110,7 @@ class Ircu2Controller(BaseServerController, DirectoryBasedController):
                 "ircd",
                 "-n",  # don't detach
                 "-f",
-                self.directory / "server.conf",
+                os.path.join(self.directory, "server.conf"),
                 "-x",
                 "DEBUG",
             ],

irctest/controllers/limnoria.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 from typing import Optional, Type
 
@@ -84,7 +85,9 @@ class LimnoriaController(BaseClientController, DirectoryBasedController):
                 )
             )
         assert self.directory
-        self.proc = subprocess.Popen(["supybot", self.directory / "bot.conf"])
+        self.proc = subprocess.Popen(
+            ["supybot", os.path.join(self.directory, "bot.conf")]
+        )
 
 
 def get_irctest_controller_class() -> Type[LimnoriaController]:

irctest/controllers/mammon.py

@@ -1,3 +1,4 @@
+import os
 import shutil
 import subprocess
 from typing import Optional, Set, Type
@@ -127,7 +128,7 @@ class MammonController(BaseServerController, DirectoryBasedController):
                 "mammond",
                 "--nofork",  # '--debug',
                 "--config",
-                self.directory / "server.yml",
+                os.path.join(self.directory, "server.yml"),
             ]
         )
 

irctest/controllers/ngircd.py

@@ -1,3 +1,4 @@
+import os
 import shutil
 import subprocess
 from typing import Optional, Set, Type
@@ -93,7 +94,7 @@ class NgircdController(BaseServerController, DirectoryBasedController):
                     password_field=password_field,
                     key_path=self.key_path,
                     pem_path=self.pem_path,
-                    empty_file=self.directory / "empty.txt",
+                    empty_file=os.path.join(self.directory, "empty.txt"),
                 )
             )
 
@@ -109,7 +110,7 @@ class NgircdController(BaseServerController, DirectoryBasedController):
                 "ngircd",
                 "--nodaemon",
                 "--config",
-                self.directory / "server.conf",
+                os.path.join(self.directory, "server.conf"),
             ],
             # stdout=subprocess.DEVNULL,
         )

irctest/controllers/snircd.py

@@ -1,3 +1,4 @@
+import os
 import shutil
 import subprocess
 from typing import Optional, Set, Type
@@ -85,7 +86,7 @@ class SnircdController(BaseServerController, DirectoryBasedController):
         self.create_config()
         password_field = 'password = "{}";'.format(password) if password else ""
         assert self.directory
-        pidfile = self.directory / "ircd.pid"
+        pidfile = os.path.join(self.directory, "ircd.pid")
         with self.open_file("server.conf") as fd:
             fd.write(
                 TEMPLATE_CONFIG.format(
@@ -108,7 +109,7 @@ class SnircdController(BaseServerController, DirectoryBasedController):
                 "ircd",
                 "-n",  # don't detach
                 "-f",
-                self.directory / "server.conf",
+                os.path.join(self.directory, "server.conf"),
                 "-x",
                 "DEBUG",
             ],

irctest/controllers/sopel.py

@@ -1,4 +1,4 @@
-from pathlib import Path
+import os
 import subprocess
 import tempfile
 from typing import Optional, TextIO, Type, cast
@@ -38,14 +38,14 @@ class SopelController(BaseClientController):
         super().kill()
         if self.filename:
             try:
-                (Path("~/.sopel/").expanduser() / self.filename).unlink()
-            except OSError:  # File does not exist
+                os.unlink(os.path.join(os.path.expanduser("~/.sopel/"), self.filename))
+            except OSError:  #  File does not exist
                 pass
 
     def open_file(self, filename: str, mode: str = "a") -> TextIO:
-        dir_path = Path("~/.sopel/").expanduser()
-        dir_path.mkdir(parents=True, exist_ok=True)
-        return cast(TextIO, (dir_path / filename).open(mode))
+        dir_path = os.path.expanduser("~/.sopel/")
+        os.makedirs(dir_path, exist_ok=True)
+        return cast(TextIO, open(os.path.join(dir_path, filename), mode))
 
     def create_config(self) -> None:
         with self.open_file(self.filename):

irctest/controllers/unrealircd.py

@@ -1,11 +1,11 @@
-import contextlib
-import fcntl
 import functools
-from pathlib import Path
+import os
+import pathlib
 import shutil
+import signal
 import subprocess
 import textwrap
-from typing import Callable, ContextManager, Iterator, Optional, Set, Type
+from typing import Optional, Set, Type
 
 from irctest.basecontrollers import (
     BaseServerController,
@@ -125,35 +125,6 @@ oper "operuser" {{
 """
 
 
-def _filelock(path: Path) -> Callable[[], ContextManager]:
-    """Alternative to :cls:`multiprocessing.Lock` that works with pytest-xdist"""
-
-    @contextlib.contextmanager
-    def f() -> Iterator[None]:
-        with open(path, "a") as fd:
-            fcntl.flock(fd, fcntl.LOCK_EX)
-            yield
-
-    return f
-
-
-_UNREALIRCD_BIN = shutil.which("unrealircd")
-if _UNREALIRCD_BIN:
-    _UNREALIRCD_PREFIX = Path(_UNREALIRCD_BIN).parent.parent
-
-    # Try to keep that lock file specific to this Unrealircd instance
-    _LOCK_PATH = _UNREALIRCD_PREFIX / "irctest-unrealircd-startstop.lock"
-else:
-    # unrealircd not found; we are probably going to crash later anyway...
-    _LOCK_PATH = Path("/tmp/irctest-unrealircd-startstop.lock")
-
-_STARTSTOP_LOCK = _filelock(_LOCK_PATH)
-"""
-Unreal cleans its tmp/ directory after each run, which prevents
-multiple processes from starting/stopping at the same time.
-"""
-
-
 @functools.lru_cache()
 def installed_version() -> int:
     output = subprocess.check_output(["unrealircd", "-v"], universal_newlines=True)
@@ -199,6 +170,18 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
         self.port = port
         self.hostname = hostname
         self.create_config()
+        (unused_hostname, unused_port) = find_hostname_and_port()
+        (services_hostname, services_port) = find_hostname_and_port()
+
+        password_field = 'password "{}";'.format(password) if password else ""
+
+        self.gen_ssl()
+        if ssl:
+            (tls_hostname, tls_port) = (hostname, port)
+            (hostname, port) = (unused_hostname, unused_port)
+        else:
+            # Unreal refuses to start without TLS enabled
+            (tls_hostname, tls_port) = (unused_hostname, unused_port)
 
         if installed_version() >= 6:
             extras = textwrap.dedent(
@@ -225,60 +208,63 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
         with self.open_file("empty.txt") as fd:
             fd.write("\n")
 
-        password_field = 'password "{}";'.format(password) if password else ""
+        assert self.directory
 
-        with _STARTSTOP_LOCK():
-            (services_hostname, services_port) = find_hostname_and_port()
-            (unused_hostname, unused_port) = find_hostname_and_port()
-
-            self.gen_ssl()
-            if ssl:
-                (tls_hostname, tls_port) = (hostname, port)
-                (hostname, port) = (unused_hostname, unused_port)
-            else:
-                # Unreal refuses to start without TLS enabled
-                (tls_hostname, tls_port) = (unused_hostname, unused_port)
-
-            assert self.directory
-
-            with self.open_file("unrealircd.conf") as fd:
-                fd.write(
-                    TEMPLATE_CONFIG.format(
-                        hostname=hostname,
-                        port=port,
-                        services_hostname=services_hostname,
-                        services_port=services_port,
-                        tls_hostname=tls_hostname,
-                        tls_port=tls_port,
-                        password_field=password_field,
-                        key_path=self.key_path,
-                        pem_path=self.pem_path,
-                        empty_file=self.directory / "empty.txt",
-                        extras=extras,
-                        set_extras=set_extras,
-                    )
+        with self.open_file("unrealircd.conf") as fd:
+            fd.write(
+                TEMPLATE_CONFIG.format(
+                    hostname=hostname,
+                    port=port,
+                    services_hostname=services_hostname,
+                    services_port=services_port,
+                    tls_hostname=tls_hostname,
+                    tls_port=tls_port,
+                    password_field=password_field,
+                    key_path=self.key_path,
+                    pem_path=self.pem_path,
+                    empty_file=os.path.join(self.directory, "empty.txt"),
+                    extras=extras,
+                    set_extras=set_extras,
                 )
-
-            if faketime and shutil.which("faketime"):
-                faketime_cmd = ["faketime", "-f", faketime]
-                self.faketime_enabled = True
-            else:
-                faketime_cmd = []
-
-            self.proc = subprocess.Popen(
-                [
-                    *faketime_cmd,
-                    "unrealircd",
-                    "-t",
-                    "-F",  # BOOT_NOFORK
-                    "-f",
-                    self.directory / "unrealircd.conf",
-                ],
-                # stdout=subprocess.DEVNULL,
             )
-            self.wait_for_port()
+
+        proot_cmd = []
+        self.using_proot = False
+        if shutil.which("proot"):
+            unrealircd_path = shutil.which("unrealircd")
+            if unrealircd_path:
+                unrealircd_prefix = pathlib.Path(unrealircd_path).parents[1]
+                tmpdir = os.path.join(self.directory, "tmp")
+                os.mkdir(tmpdir)
+                # Unreal cleans its tmp/ directory after each run, which prevents
+                # multiple processes from running at the same time.
+                # Using PRoot, we can isolate them, with a tmp/ directory for each
+                # process, so they don't interfere with each other, allowing use of
+                # the -n option (of pytest-xdist) to speed-up tests
+                proot_cmd = ["proot", "-b", f"{tmpdir}:{unrealircd_prefix}/tmp"]
+                self.using_proot = True
+
+        if faketime and shutil.which("faketime"):
+            faketime_cmd = ["faketime", "-f", faketime]
+            self.faketime_enabled = True
+        else:
+            faketime_cmd = []
+
+        self.proc = subprocess.Popen(
+            [
+                *proot_cmd,
+                *faketime_cmd,
+                "unrealircd",
+                "-t",
+                "-F",  # BOOT_NOFORK
+                "-f",
+                os.path.join(self.directory, "unrealircd.conf"),
+            ],
+            # stdout=subprocess.DEVNULL,
+        )
 
         if run_services:
+            self.wait_for_port()
             self.services_controller = self.services_controller_class(
                 self.test_config, self
             )
@@ -288,13 +274,17 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
                 server_port=services_port,
             )
 
-    def kill_proc(self) -> None:
-        assert self.proc
-
-        with _STARTSTOP_LOCK():
-            self.proc.kill()
-            self.proc.wait(5)  # wait for it to actually die
-            self.proc = None
+    def kill(self) -> None:
+        if self.using_proot:
+            # Kill grandchild process, instead of killing proot, which takes more
+            # time (and does not seem to always work)
+            assert self.proc is not None
+            output = subprocess.check_output(
+                ["ps", "-opid", "--no-headers", "--ppid", str(self.proc.pid)]
+            )
+            (grandchild_pid,) = [int(line) for line in output.decode().split()]
+            os.kill(grandchild_pid, signal.SIGKILL)
+        super().kill()
 
 
 def get_irctest_controller_class() -> Type[UnrealircdController]:

irctest/dashboard/format.py

@@ -173,7 +173,6 @@ def build_module_html(
 
 
 def build_test_table(jobs: List[str], results: List[CaseResult]) -> ET.Element:
-    multiple_modules = len({r.module_name for r in results}) > 1
     results_by_module_and_class = group_by(
         results, lambda r: (r.module_name, r.class_name)
     )
@@ -190,29 +189,19 @@ def build_test_table(jobs: List[str], results: List[CaseResult]) -> ET.Element:
     for ((module_name, class_name), class_results) in sorted(
         results_by_module_and_class.items()
     ):
-        if multiple_modules:
-            # if the page shows classes from various modules, use the fully-qualified
-            # name in order to disambiguate and be clearer (eg. show
-            # "irctest.server_tests.extended_join.MetadataTestCase" instead of just
-            # "MetadataTestCase" which looks like it's about IRCv3's METADATA spec.
-            qualified_class_name = f"{module_name}.{class_name}"
-        else:
-            # otherwise, it's not needed, so let's not display it
-            qualified_class_name = class_name
-
         module = importlib.import_module(module_name)
 
         # Header row: class name
         header_row = ET.SubElement(table, "tr")
         th = ET.SubElement(header_row, "th", colspan=str(len(jobs) + 1))
-        row_anchor = f"{qualified_class_name}"
+        row_anchor = f"{class_name}"
         section_header = ET.SubElement(
             ET.SubElement(th, "h2"),
             "a",
             href=f"#{row_anchor}",
             id=row_anchor,
         )
-        section_header.text = qualified_class_name
+        section_header.text = class_name
         append_docstring(th, getattr(module, class_name))
 
         # Header row: one column for each implementation
@@ -221,7 +210,7 @@ def build_test_table(jobs: List[str], results: List[CaseResult]) -> ET.Element:
         # One row for each test:
         results_by_test = group_by(class_results, key=lambda r: r.test_name)
         for (test_name, test_results) in sorted(results_by_test.items()):
-            row_anchor = f"{qualified_class_name}.{test_name}"
+            row_anchor = f"{class_name}.{test_name}"
             if len(row_anchor) >= 50:
                 # Too long; give up on generating readable URL
                 # TODO: only hash test parameter
@@ -303,7 +292,7 @@ def write_html_pages(
             for result in results
         )
         assert is_client != is_server, (job, is_client, is_server)
-        if job.endswith(("-atheme", "-anope", "-dlk")):
+        if job.endswith(("-atheme", "-anope")):
             assert is_server
             job_categories[job] = "server-with-services"
         elif is_server:

irctest/server_tests/away.py

@@ -4,13 +4,7 @@ AWAY command (`RFC 2812 <https://datatracker.ietf.org/doc/html/rfc2812#section-4
 """
 
 from irctest import cases
-from irctest.numerics import (
-    RPL_AWAY,
-    RPL_NOWAWAY,
-    RPL_UNAWAY,
-    RPL_USERHOST,
-    RPL_WHOISUSER,
-)
+from irctest.numerics import RPL_AWAY, RPL_NOWAWAY, RPL_UNAWAY, RPL_USERHOST
 from irctest.patma import StrRe
 
 
@@ -145,33 +139,3 @@ class AwayTestCase(cases.BaseServerTestCase):
         self.assertMessageMatch(
             self.getMessage(2), command=RPL_USERHOST, params=["qux", StrRe(r"bar=-.*")]
         )
-
-    @cases.mark_specifications("Modern")
-    def testAwayEmptyMessage(self):
-        """
-        "If [AWAY] is sent with a nonempty parameter (the 'away message')
-        then the user is set to be away. If this command is sent with no
-        parameters, or with the empty string as the parameter, the user is no
-        longer away."
-        -- https://modern.ircdocs.horse/#away-message
-        """
-        self.connectClient("bar", name="bar")
-        self.connectClient("qux", name="qux")
-
-        self.sendLine("bar", "AWAY :I'm not here right now")
-        replies = self.getMessages("bar")
-        self.assertIn(RPL_NOWAWAY, [msg.command for msg in replies])
-        self.sendLine("qux", "WHOIS bar")
-        replies = self.getMessages("qux")
-        self.assertIn(RPL_WHOISUSER, [msg.command for msg in replies])
-        self.assertIn(RPL_AWAY, [msg.command for msg in replies])
-
-        # empty final parameter to AWAY is treated the same as no parameter,
-        # i.e., the client is considered to be no longer away
-        self.sendLine("bar", "AWAY :")
-        replies = self.getMessages("bar")
-        self.assertIn(RPL_UNAWAY, [msg.command for msg in replies])
-        self.sendLine("qux", "WHOIS bar")
-        replies = self.getMessages("qux")
-        self.assertIn(RPL_WHOISUSER, [msg.command for msg in replies])
-        self.assertNotIn(RPL_AWAY, [msg.command for msg in replies])

irctest/server_tests/chathistory.py

@@ -18,8 +18,6 @@ EVENT_PLAYBACK_CAP = "draft/event-playback"
 # Keep this in sync with validate_chathistory()
 SUBCOMMANDS = ["LATEST", "BEFORE", "AFTER", "BETWEEN", "AROUND"]
 
-MYSQL_PASSWORD = ""
-
 
 def validate_chathistory_batch(msgs):
     batch_tag = None

irctest/server_tests/chmodes/ban.py

@@ -7,18 +7,14 @@ and ban exception (`Modern <https://modern.ircdocs.horse/#exception-channel-mode
 """
 
 from irctest import cases, runner
-from irctest.numerics import (
-    ERR_BANNEDFROMCHAN,
-    ERR_CANNOTSENDTOCHAN,
-    RPL_BANLIST,
-    RPL_ENDOFBANLIST,
-)
+from irctest.numerics import ERR_BANNEDFROMCHAN, RPL_BANLIST, RPL_ENDOFBANLIST
 from irctest.patma import ANYSTR, StrRe
 
 
 class BanModeTestCase(cases.BaseServerTestCase):
     @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
-    def testBanJoin(self):
+    def testBan(self):
+        """Basic ban operation"""
         self.connectClient("chanop", name="chanop")
         self.joinChannel("chanop", "#chan")
         self.getMessages("chanop")
@@ -36,55 +32,6 @@ class BanModeTestCase(cases.BaseServerTestCase):
         self.sendLine("bar", "JOIN #chan")
         self.assertMessageMatch(self.getMessage("bar"), command="JOIN")
 
-    @cases.mark_specifications("Modern")
-    def testBanPrivmsg(self):
-        """
-        TODO: this checks the following quote is false:
-
-        "If `<target>` is a channel name and the client is [banned](#ban-channel-mode)
-        and not covered by a [ban exception](#ban-exception-channel-mode), the
-        message will not be delivered and the command will silently fail."
-        -- https://modern.ircdocs.horse/#privmsg-message
-
-        to check https://github.com/ircdocs/modern-irc/pull/201
-        """
-        self.connectClient("chanop", name="chanop")
-        self.joinChannel("chanop", "#chan")
-        self.getMessages("chanop")
-
-        self.connectClient("Bar", name="bar")
-        self.getMessages("bar")
-        self.sendLine("bar", "JOIN #chan")
-        self.getMessages("bar")
-        self.getMessages("chanop")
-
-        self.sendLine("chanop", "MODE #chan +b bar!*@*")
-        self.assertMessageMatch(self.getMessage("chanop"), command="MODE")
-        self.getMessages("chanop")
-        self.getMessages("bar")
-
-        self.sendLine("bar", "PRIVMSG #chan :hello world")
-        self.assertMessageMatch(
-            self.getMessage("bar"),
-            command=ERR_CANNOTSENDTOCHAN,
-            params=["Bar", "#chan", ANYSTR],
-        )
-        self.assertEqual(self.getMessages("bar"), [])
-        self.assertEqual(self.getMessages("chanop"), [])
-
-        self.sendLine("chanop", "MODE #chan -b bar!*@*")
-        self.assertMessageMatch(self.getMessage("chanop"), command="MODE")
-        self.getMessages("chanop")
-        self.getMessages("bar")
-
-        self.sendLine("bar", "PRIVMSG #chan :hello again")
-        self.assertEqual(self.getMessages("bar"), [])
-        self.assertMessageMatch(
-            self.getMessage("chanop"),
-            command="PRIVMSG",
-            params=["#chan", "hello again"],
-        )
-
     @cases.mark_specifications("Modern")
     def testBanList(self):
         """`RPL_BANLIST <https://modern.ircdocs.horse/#rplbanlist-367>`_"""

irctest/server_tests/regressions.py

@@ -2,13 +2,10 @@
 Regression tests for bugs in `Ergo <https://ergo.chat/>`_.
 """
 
+import time
+
 from irctest import cases, runner
-from irctest.numerics import (
-    ERR_ERRONEUSNICKNAME,
-    ERR_NICKNAMEINUSE,
-    RPL_HELLO,
-    RPL_WELCOME,
-)
+from irctest.numerics import ERR_ERRONEUSNICKNAME, ERR_NICKNAMEINUSE, RPL_WELCOME
 from irctest.patma import ANYDICT
 
 
@@ -114,7 +111,8 @@ class RegressionsTestCase(cases.BaseServerTestCase):
         self.sendLine(1, "NICK *")
         self.sendLine(1, "USER u s e r")
         replies = {"NOTICE"}
-        while replies <= {"NOTICE", RPL_HELLO}:
+        time.sleep(2)  # give time to slow servers, like irc2 to reply
+        while replies == {"NOTICE"}:
             replies = set(msg.command for msg in self.getMessages(1, synchronize=False))
         self.assertIn(ERR_ERRONEUSNICKNAME, replies)
         self.assertNotIn(RPL_WELCOME, replies)

irctest/server_tests/sasl.py

@@ -178,14 +178,6 @@ class SaslTestCase(cases.BaseServerTestCase):
         ),
         "Anope does not handle split AUTHENTICATE (reported on IRC)",
     )
-    @cases.xfailIf(
-        lambda self: (
-            self.controller.services_controller is not None
-            and self.controller.services_controller.software_name == "Dlk-Services"
-        ),
-        "Dlk does not handle split AUTHENTICATE "
-        "https://github.com/DalekIRC/Dalek-Services/issues/28",
-    )
     def testPlainLarge(self):
         """Test the client splits large AUTHENTICATE messages whose payload
         is not a multiple of 400.

irctest/server_tests/time.py

@@ -1,48 +0,0 @@
-import math
-import time
-
-from irctest import cases
-from irctest.numerics import RPL_TIME
-from irctest.patma import ANYSTR, StrRe
-
-
-class TimeTestCase(cases.BaseServerTestCase):
-    def testTime(self):
-        self.connectClient("user")
-
-        time_before = math.floor(time.time())
-        self.sendLine(1, "TIME")
-
-        msg = self.getMessage(1)
-
-        time_after = math.ceil(time.time())
-
-        if len(msg.params) == 5:
-            # ircu2, snircd
-            self.assertMessageMatch(
-                msg,
-                command=RPL_TIME,
-                params=["user", "My.Little.Server", StrRe("[0-9]+"), "0", ANYSTR],
-            )
-            self.assertIn(
-                int(msg.params[2]),
-                range(time_before, time_after + 1),
-                "Timestamp not in expected range",
-            )
-        elif len(msg.params) == 4:
-            # bahamut
-            self.assertMessageMatch(
-                msg,
-                command=RPL_TIME,
-                params=["user", "My.Little.Server", StrRe("[0-9]+"), ANYSTR],
-            )
-            self.assertIn(
-                int(msg.params[2]),
-                range(time_before, time_after + 1),
-                "Timestamp not in expected range",
-            )
-        else:
-            # Common case
-            self.assertMessageMatch(
-                msg, command=RPL_TIME, params=["user", "My.Little.Server", ANYSTR]
-            )

irctest/server_tests/who.py

@@ -37,8 +37,8 @@ class BaseWhoTestCase:
         self.sendLine(1, f"USER {self.username} 0 * :{self.realname}")
         if auth:
             self.sendLine(1, "CAP END")
+            self.getRegistrationMessage(1)
         self.skipToWelcome(1)
-        self.getMessages(1)
         self.sendLine(1, "JOIN #chan")
 
         self.getMessages(1)
@@ -503,34 +503,3 @@ class WhoServicesTestCase(BaseWhoTestCase, cases.BaseServerTestCase):
             command=RPL_ENDOFWHO,
             params=["otherNick", InsensitiveStr("coolNick"), ANYSTR],
         )
-
-
-class WhoInvisibleTestCase(cases.BaseServerTestCase):
-    @cases.mark_specifications("Modern")
-    def testWhoInvisible(self):
-        if self.controller.software_name == "Bahamut":
-            raise runner.OptionalExtensionNotSupported("WHO mask")
-
-        self.connectClient("evan", name="evan")
-        self.sendLine("evan", "MODE evan +i")
-        self.getMessages("evan")
-
-        self.connectClient("shivaram", name="shivaram")
-        self.getMessages("shivaram")
-        self.sendLine("shivaram", "WHO eva*")
-        reply_cmds = {msg.command for msg in self.getMessages("shivaram")}
-        self.assertEqual(reply_cmds, {RPL_ENDOFWHO})
-
-        # invisibility should not be respected for plain nicknames, only for masks:
-        self.sendLine("shivaram", "WHO evan")
-        replies = self.getMessages("shivaram")
-        reply_cmds = {msg.command for msg in replies}
-        self.assertEqual(reply_cmds, {RPL_WHOREPLY, RPL_ENDOFWHO})
-
-        # invisibility should not be respected if the users share a channel
-        self.joinChannel("evan", "#test")
-        self.joinChannel("shivaram", "#test")
-        self.sendLine("shivaram", "WHO eva*")
-        replies = self.getMessages("shivaram")
-        reply_cmds = {msg.command for msg in replies}
-        self.assertEqual(reply_cmds, {RPL_WHOREPLY, RPL_ENDOFWHO})

irctest/server_tests/whois.py

@@ -71,10 +71,7 @@ class _WhoisTestMixin(cases.BaseServerTestCase):
             last_message,
             command=RPL_ENDOFWHOIS,
             params=["nick1", "nick2", ANYSTR],
-            fail_msg=(
-                f"Expected RPL_ENDOFWHOIS ({RPL_ENDOFWHOIS}) as last message, "
-                f"got {{msg}}"
-            ),
+            fail_msg=f"Last message was not RPL_ENDOFWHOIS ({RPL_ENDOFWHOIS})",
         )
 
         unexpected_messages = []

irctest/server_tests/whowas.py

@@ -98,7 +98,7 @@ class WhowasTestCase(cases.BaseServerTestCase):
 
         "Servers MUST reply with either ERR_WASNOSUCHNICK or [...],
         both followed with RPL_ENDOFWHOWAS"
-        -- https://modern.ircdocs.horse/#whowas-message
+        -- https://github.com/ircdocs/modern-irc/pull/170
         """
         self.connectClient("nick1")
 
@@ -210,7 +210,7 @@ class WhowasTestCase(cases.BaseServerTestCase):
         "The history is searched backward, returning the most recent entry first."
         -- https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
         -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
-        -- https://modern.ircdocs.horse/#whowas-message
+        -- https://github.com/ircdocs/modern-irc/pull/170
         """
         self._testWhowasMultiple(second_result=True, whowas_command="WHOWAS nick2")
 
@@ -224,7 +224,7 @@ class WhowasTestCase(cases.BaseServerTestCase):
         "If there are multiple entries, up to <count> replies will be returned"
         -- https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
         -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
-        -- https://modern.ircdocs.horse/#whowas-message
+        -- https://github.com/ircdocs/modern-irc/pull/170
         """
         self._testWhowasMultiple(second_result=False, whowas_command="WHOWAS nick2 1")
 
@@ -238,7 +238,7 @@ class WhowasTestCase(cases.BaseServerTestCase):
         "If there are multiple entries, up to <count> replies will be returned"
         -- https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
         -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
-        -- https://modern.ircdocs.horse/#whowas-message
+        -- https://github.com/ircdocs/modern-irc/pull/170
         """
         self._testWhowasMultiple(second_result=True, whowas_command="WHOWAS nick2 2")
 
@@ -253,10 +253,7 @@ class WhowasTestCase(cases.BaseServerTestCase):
         is done."
         -- https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
         -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
-
-        "If given, <count> SHOULD be a positive number. Otherwise, a full search
-        "is done.
-        -- https://modern.ircdocs.horse/#whowas-message
+        -- https://github.com/ircdocs/modern-irc/pull/170
         """
         self._testWhowasMultiple(second_result=True, whowas_command="WHOWAS nick2 -1")
 
@@ -274,10 +271,7 @@ class WhowasTestCase(cases.BaseServerTestCase):
         is done."
         -- https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
         -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
-
-        "If given, <count> SHOULD be a positive number. Otherwise, a full search
-        "is done.
-        -- https://modern.ircdocs.horse/#whowas-message
+        -- https://github.com/ircdocs/modern-irc/pull/170
         """
         self._testWhowasMultiple(second_result=True, whowas_command="WHOWAS nick2 0")
 
@@ -286,7 +280,7 @@ class WhowasTestCase(cases.BaseServerTestCase):
         """
         "Wildcards are allowed in the <target> parameter."
         -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
-        -- https://modern.ircdocs.horse/#whowas-message
+        -- https://github.com/ircdocs/modern-irc/pull/170
         """
         if self.controller.software_name == "Bahamut":
             raise runner.OptionalExtensionNotSupported("WHOWAS mask")
@@ -330,7 +324,7 @@ class WhowasTestCase(cases.BaseServerTestCase):
         """
         "If the `<nick>` argument is missing, they SHOULD send a single reply, using
         either ERR_NONICKNAMEGIVEN or ERR_NEEDMOREPARAMS"
-        -- https://modern.ircdocs.horse/#whowas-message
+        -- https://github.com/ircdocs/modern-irc/pull/170
         """
         # But no one seems to follow this. Most implementations use ERR_NEEDMOREPARAMS
         # instead of ERR_NONICKNAMEGIVEN; and I couldn't find any that returns
@@ -364,7 +358,7 @@ class WhowasTestCase(cases.BaseServerTestCase):
         """
         https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
         https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
-        -- https://modern.ircdocs.horse/#whowas-message
+        -- https://github.com/ircdocs/modern-irc/pull/170
 
         and:
 
@@ -377,7 +371,7 @@ class WhowasTestCase(cases.BaseServerTestCase):
 
         "Servers MUST reply with either ERR_WASNOSUCHNICK or [...],
         both followed with RPL_ENDOFWHOWAS"
-        -- https://modern.ircdocs.horse/#whowas-message
+        -- https://github.com/ircdocs/modern-irc/pull/170
         """
         self.connectClient("nick1")
 

make_workflows.py

@@ -144,9 +144,13 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
     downloads = []
     install_steps = []
     for software_id in test_config.get("software", []):
-        software_config = config["software"][software_id]
+        if software_id == "anope":
+            # TODO: don't hardcode anope here
+            software_config = {"separate_build_job": True}
+        else:
+            software_config = config["software"][software_id]
 
-        env += software_config.get("env", "") + " "
+        env += test_config.get("env", {}).get(version_flavor.value, "") + " "
         if "prefix" in software_config:
             env += (
                 f"PATH={software_config['prefix']}/sbin"
@@ -241,6 +245,47 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
     }
 
 
+def get_build_job_anope():
+    return {
+        "runs-on": "ubuntu-latest",
+        "steps": [
+            {"uses": "actions/checkout@v2"},
+            {
+                "name": "Create directories",
+                "run": "cd ~/; mkdir -p .local/ go/",
+            },
+            {
+                "name": "Cache Anope",
+                "uses": "actions/cache@v2",
+                "with": {
+                    "path": "~/.cache\n${{ github.workspace }}/anope\n",
+                    "key": "3-${{ runner.os }}-anope-2.0.9",
+                },
+            },
+            {
+                "name": "Checkout Anope",
+                "uses": "actions/checkout@v2",
+                "with": {
+                    "repository": "anope/anope",
+                    "ref": "2.0.9",
+                    "path": "anope",
+                },
+            },
+            {
+                "name": "Build Anope",
+                "run": script(
+                    "cd $GITHUB_WORKSPACE/anope/",
+                    "cp $GITHUB_WORKSPACE/data/anope/* .",
+                    "CFLAGS=-O0 ./Config -quick",
+                    "make -C build -j 4",
+                    "make -C build install",
+                ),
+            },
+            *upload_steps("anope"),
+        ],
+    }
+
+
 def upload_steps(software_id):
     """Make a tarball (to preserve permissions) and upload"""
     return [
@@ -281,6 +326,7 @@ def generate_workflow(config: dict, version_flavor: VersionFlavor):
         }
 
     jobs = {}
+    jobs["build-anope"] = get_build_job_anope()
 
     for software_id in config["software"]:
         software_config = config["software"][software_id]

patches/bahamut_mainloop.patch

@@ -1,15 +0,0 @@
-Lower Bahamut's delay between processing incoming commands
-
-diff --git a/src/s_bsd.c b/src/s_bsd.c
-index fcc1d02..951fd8c 100644
---- a/src/s_bsd.c
-+++ b/src/s_bsd.c
-@@ -1458,7 +1458,7 @@ int do_client_queue(aClient *cptr)
-     int dolen = 0, done;
-     
-     while (SBufLength(&cptr->recvQ) && !NoNewLine(cptr) &&
--       ((cptr->status < STAT_UNKNOWN) || (cptr->since - timeofday < 10) ||
-+       ((cptr->status < STAT_UNKNOWN) || (cptr->since - timeofday < 20) ||
-         IsNegoServer(cptr))) 
-     {
-         /* If it's become registered as a server, just parse the whole block */

workflows.yml

@@ -105,7 +105,6 @@ software:
         build_script: |
             cd $GITHUB_WORKSPACE/Bahamut/
             patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch
-            patch src/s_bsd.c < $GITHUB_WORKSPACE/patches/bahamut_mainloop.patch
             echo "#undef THROTTLE_ENABLE" >> include/config.h
             libtoolize --force
             aclocal
@@ -131,7 +130,7 @@ software:
         pre_deps:
             - uses: actions/setup-go@v2
               with:
-                  go-version: '^1.19.0'
+                  go-version: '^1.18.0'
             - run: go version
         separate_build_job: false
         build_script: |
@@ -301,47 +300,6 @@ software:
         separate_build_job: true
         build_script: *unrealircd_build_script
 
-
-    #############################
-    # Services:
-
-    anope:
-        name: Anope
-        repository: anope/anope
-        separate_build_job: true
-        path: anope
-        refs:
-            stable: "2.0.9"
-            release: "2.0.9"
-            devel: "2.0.9"
-            devel_release: "2.0.9"
-        build_script: |
-            cd $GITHUB_WORKSPACE/anope/
-            cp $GITHUB_WORKSPACE/data/anope/* .
-            CFLAGS=-O0 ./Config -quick
-            make -C build -j 4
-            make -C build install
-
-    dlk:
-        name: Dlk
-        repository: DalekIRC/Dalek-Services
-        separate_build_job: false
-        path: Dlk-Services
-        refs:
-            stable: &dlk_stable "effd18652fc1c847d1959089d9cca9ff9837a8c0"
-            release: *dlk_stable
-            devel: "main"
-            devel_release: *dlk_stable
-        build_script: |
-            pip install pifpaf
-            wget -q https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
-            wget -q https://wordpress.org/latest.zip -O wordpress-latest.zip
-        env: >-
-            IRCTEST_DLK_PATH="${{ github.workspace }}/Dlk-Services"
-            IRCTEST_WP_CLI_PATH="${{ github.workspace }}/wp-cli.phar"
-            IRCTEST_WP_ZIP_PATH="${{ github.workspace }}/wordpress-latest.zip"
-
-
     #############################
     # Clients:
 
@@ -444,9 +402,6 @@ tests:
     unrealircd-anope:
         software: [unrealircd, anope]
 
-    unrealircd-dlk:
-        software: [unrealircd, dlk]
-
 
     limnoria:
         software: [limnoria]