Merge 0816232c1c5159d46ea5013f78f72f6f72024147 into a1324407893b603fe6b55ce7c4ee385938291ae1

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
         python-version: 3.11
 
     - name: Cache dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v2
       with:
         path: |
           ~/.cache

.github/workflows/test-devel.yml

@@ -120,8 +120,6 @@ jobs:
         path: ircd-hybrid
         ref: 8.2.x
         repository: ircd-hybrid/ircd-hybrid
-    - name: Install system dependencies
-      run: sudo apt-get install atheme-services faketime libjansson-dev
     - name: Build Hybrid
       run: |
         cd $GITHUB_WORKSPACE/ircd-hybrid/
@@ -455,9 +453,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         bahamut
       timeout-minutes: 30
@@ -496,9 +492,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH   make
         bahamut-anope
       timeout-minutes: 30
@@ -531,9 +525,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         bahamut-atheme
       timeout-minutes: 30
@@ -560,7 +552,7 @@ jobs:
         repository: ergochat/ergo
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.24.0
+        go-version: ^1.22.0
     - run: go version
     - name: Build Ergo
       run: |
@@ -573,9 +565,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/go/sbin:~/go/bin:~/go:$PATH
         make ergo
       timeout-minutes: 30
@@ -614,9 +604,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH   make
         hybrid
       timeout-minutes: 30
@@ -649,9 +637,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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
@@ -690,9 +676,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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
@@ -731,9 +715,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         ircu2
       timeout-minutes: 30
@@ -761,9 +743,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         limnoria
       timeout-minutes: 30
@@ -801,9 +781,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         nefarious
       timeout-minutes: 30
@@ -836,9 +814,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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//sbin:~/.local//bin:~/.local/:$PATH
         make ngircd
       timeout-minutes: 30
@@ -877,9 +853,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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//sbin:~/.local//bin:~/.local/:$PATH  make
         ngircd-anope
       timeout-minutes: 30
@@ -912,9 +886,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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//sbin:~/.local//bin:~/.local/:$PATH
         make ngircd-atheme
       timeout-minutes: 30
@@ -953,9 +925,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH   make
         plexus4
       timeout-minutes: 30
@@ -1002,9 +972,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
         make sable
       timeout-minutes: 30
@@ -1037,9 +1005,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         solanum
       timeout-minutes: 30
@@ -1066,9 +1032,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         sopel
       timeout-minutes: 30
@@ -1106,9 +1070,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         thelounge
       timeout-minutes: 30
@@ -1141,9 +1103,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd
       timeout-minutes: 30
@@ -1176,9 +1136,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd-5
       timeout-minutes: 30
@@ -1217,9 +1175,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH  make
         unrealircd-anope
       timeout-minutes: 30
@@ -1252,9 +1208,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd-atheme
       timeout-minutes: 30
@@ -1298,9 +1252,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         IRCTEST_DLK_PATH="${{ github.workspace }}/Dlk-Services" IRCTEST_WP_CLI_PATH="${{
         github.workspace }}/wp-cli.phar" IRCTEST_WP_ZIP_PATH="${{ github.workspace

.github/workflows/test-devel_release.yml

@@ -126,9 +126,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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
@@ -167,9 +165,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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
@@ -202,9 +198,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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

.github/workflows/test-stable.yml

@@ -65,7 +65,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: Bahamut
-        ref: v2.2.4
+        ref: v2.2.1
         repository: DALnet/Bahamut
     - name: Build Bahamut
       run: |
@@ -161,8 +161,6 @@ jobs:
         path: ircd-hybrid
         ref: 8.2.39
         repository: ircd-hybrid/ircd-hybrid
-    - name: Install system dependencies
-      run: sudo apt-get install atheme-services faketime libjansson-dev
     - name: Build Hybrid
       run: |
         cd $GITHUB_WORKSPACE/ircd-hybrid/
@@ -230,7 +228,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: ngircd
-        ref: acf8409c60ccc96beed0a1f990c4f9374823c0ce
+        ref: 3e3f6cbeceefd9357b53b27c2386bb39306ab353
         repository: ngircd/ngircd
     - name: Build ngircd
       run: |
@@ -353,7 +351,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: unrealircd
-        ref: a68625454078641ce984eeb197f7e02b1857ab6c
+        ref: da3c1c654481a33035b9c703957e1c25d0158259
         repository: unrealircd/unrealircd
     - name: Build UnrealIRCd 6
       run: |
@@ -498,9 +496,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         bahamut
       timeout-minutes: 30
@@ -539,9 +535,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH   make
         bahamut-anope
       timeout-minutes: 30
@@ -574,9 +568,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         bahamut-atheme
       timeout-minutes: 30
@@ -609,9 +601,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         charybdis
       timeout-minutes: 30
@@ -638,7 +628,7 @@ jobs:
         repository: ergochat/ergo
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.24.0
+        go-version: ^1.22.0
     - run: go version
     - name: Build Ergo
       run: |
@@ -651,9 +641,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/go/sbin:~/go/bin:~/go:$PATH
         make ergo
       timeout-minutes: 30
@@ -692,9 +680,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH   make
         hybrid
       timeout-minutes: 30
@@ -727,9 +713,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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
@@ -768,9 +752,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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
@@ -803,9 +785,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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
@@ -855,9 +835,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         irc2
       timeout-minutes: 30
@@ -896,9 +874,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         ircu2
       timeout-minutes: 30
@@ -925,9 +901,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         limnoria
       timeout-minutes: 30
@@ -965,9 +939,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         nefarious
       timeout-minutes: 30
@@ -1000,9 +972,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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//sbin:~/.local//bin:~/.local/:$PATH
         make ngircd
       timeout-minutes: 30
@@ -1041,9 +1011,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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//sbin:~/.local//bin:~/.local/:$PATH  make
         ngircd-anope
       timeout-minutes: 30
@@ -1076,9 +1044,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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//sbin:~/.local//bin:~/.local/:$PATH
         make ngircd-atheme
       timeout-minutes: 30
@@ -1117,9 +1083,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH   make
         plexus4
       timeout-minutes: 30
@@ -1142,7 +1106,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: sable
-        ref: baed3ef9ac4550dc36a45b758436769e82e8ec58
+        ref: e9701e5e8d0c4f278ddd61ce7285f4918ecf99e9
         repository: Libera-Chat/sable
     - name: Install rust toolchain
       uses: actions-rs/toolchain@v1
@@ -1166,9 +1130,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
         make sable
       timeout-minutes: 30
@@ -1201,9 +1163,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         solanum
       timeout-minutes: 30
@@ -1230,9 +1190,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         sopel
       timeout-minutes: 30
@@ -1270,9 +1228,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         thelounge
       timeout-minutes: 30
@@ -1305,9 +1261,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd
       timeout-minutes: 30
@@ -1340,9 +1294,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd-5
       timeout-minutes: 30
@@ -1381,9 +1333,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH  make
         unrealircd-anope
       timeout-minutes: 30
@@ -1416,9 +1366,7 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        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/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd-atheme
       timeout-minutes: 30

Makefile

@@ -84,12 +84,15 @@ 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,20 +11,7 @@ import subprocess
 import tempfile
 import textwrap
 import time
-from typing import (
+from typing import IO, Any, Callable, Dict, Iterator, List, Optional, Set, Tuple, Type
-    IO,
-    Any,
-    Callable,
-    Dict,
-    Iterator,
-    List,
-    Optional,
-    Sequence,
-    Set,
-    Tuple,
-    Type,
-    Union,
-)
 
 import irctest
 
@@ -87,7 +74,6 @@ 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()
@@ -144,12 +130,6 @@ 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 = "My.Little.Services"
+    name = "services.example.org"
     description = "Anope IRC Services"
     numeric = "00A"
     pid = "services.pid"
@@ -66,13 +66,8 @@ options {{
     warningtimeout = 4h
 }}
 
-module {{ name = "ns_sasl" }} # since 2.1.13
+module {{ name = "{module_prefix}sasl" }}
-module {{ name = "sasl" }}    # 2.1.2 to 2.1.12
+module {{ name = "enc_bcrypt" }}
-module {{ name = "m_sasl" }}  # 2.0 to 2.1.1
-
-module {{ name = "enc_sha2" }}   # 2.1
-module {{ name = "enc_sha256" }} # 2.0
-
 module {{ name = "ns_cert" }}
 
 """
@@ -128,6 +123,7 @@ class AnopeController(BaseServicesController, DirectoryBasedController):
                     protocol=protocol,
                     server_hostname=server_hostname,
                     server_port=server_port,
+                    module_prefix="" if self.software_version >= (2, 1, 2) else "m_",
                 )
             )
 
@@ -140,19 +136,16 @@ class AnopeController(BaseServicesController, DirectoryBasedController):
             Path(services_path).parent.parent / "modules"
         )
 
-        extra_args = []
+        self.proc = subprocess.Popen(
-        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,3 +1,4 @@
+import subprocess
 from typing import Optional, Type
 
 import irctest
@@ -24,7 +25,7 @@ loadmodule "modules/saslserv/plain";
 #loadmodule "modules/saslserv/scram";
 
 serverinfo {{
-    name = "My.Little.Services";
+    name = "services.example.org";
     desc = "Atheme IRC Services";
     numeric = "00A";
     netname = "testnet";
@@ -74,7 +75,7 @@ class AthemeController(BaseServicesController, DirectoryBasedController):
             )
 
         assert self.directory
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 "atheme-services",
                 "-n",  # don't fork
@@ -87,6 +88,8 @@ class AthemeController(BaseServicesController, DirectoryBasedController):
                 "-D",
                 self.directory,
             ],
+            # stdout=subprocess.DEVNULL,
+            # stderr=subprocess.DEVNULL,
         )
 
     def registerUser(

irctest/controllers/bahamut.py

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

irctest/controllers/base_hybrid.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 import shutil
+import subprocess
 from typing import Optional
 
 from irctest.basecontrollers import BaseServerController, DirectoryBasedController
@@ -73,7 +74,7 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 *faketime_cmd,
                 self.binary_name,
@@ -83,6 +84,7 @@ 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 "My.Little.Services" {{
+connect "services.example.org" {{
     host = "localhost";  # Used to validate incoming connection
     port = 0;  # We don't need servers to connect to services
     send_password = "password";
@@ -53,14 +53,14 @@ connect "My.Little.Services" {{
     flags = topicburst;
 }};
 service {{
-    name = "My.Little.Services";
+    name = "services.example.org";
 }};
 
 privset "omnioper" {{
     privs = oper:general, oper:privs, oper:testline, oper:kill, oper:operwall, oper:message,
             oper:routing, oper:kline, oper:unkline, oper:xline,
             oper:resv, oper:cmodes, oper:mass_notice, oper:wallops,
-            oper:remoteban, oper:local_kill,
+            oper:remoteban,
             usermode:servnotice, auspex:oper, auspex:hostname, auspex:umodes, auspex:cmodes,
             oper:admin, oper:die, oper:rehash, oper:spy, oper:grant;
 }};

irctest/controllers/dlk_services.py

@@ -13,7 +13,7 @@ TEMPLATE_DLK_CONFIG = """\
 info {{
     SID "00A";
     network-name "testnetwork";
-    services-name "My.Little.Services";
+    services-name "services.example.org";
     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 = self.execute(
+        self.proc = subprocess.Popen(
             [
                 "php",
                 "src/dalek",

irctest/controllers/ergo.py

@@ -213,7 +213,7 @@ class ErgoController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [*faketime_cmd, "ergo", "run", "--conf", self._config_path, "--quiet"]
         )
 

irctest/controllers/girc.py

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

irctest/controllers/hybrid.py

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

irctest/controllers/inspircd.py

@@ -19,7 +19,7 @@ TEMPLATE_CONFIG = """
 
 <class
     name="ServerOperators"
-    commands="WALLOPS GLOBOPS KILL"
+    commands="WALLOPS GLOBOPS"
     privs="channels/auspex users/auspex channels/auspex servers/auspex"
     >
 <type
@@ -33,15 +33,14 @@ 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="My.Little.Services"
+<link name="services.example.org"
     ipaddr="{services_hostname}"
     port="{services_port}"
     allowmask="*"
@@ -51,7 +50,7 @@ TEMPLATE_CONFIG = """
 <module name="spanningtree">
 <module name="hidechans">  # Anope errors when missing
 <sasl requiressl="no"
-      target="My.Little.Services">
+      target="services.example.org">
 
 # Protocol:
 <module name="banexception">
@@ -183,22 +182,15 @@ class InspircdController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        extra_args = []
+        self.proc = subprocess.Popen(
-        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,4 +1,5 @@
 import shutil
+import subprocess
 from typing import Optional, Type
 
 from irctest.basecontrollers import (
@@ -24,7 +25,7 @@ Y:10:90::100:512000:100.100:100.100:
 I::{password_field}:::10::
 
 # O:<TARGET Host NAME>:<Password>:<Nickname>:<Port>:<Class>:<Flags>:
-O:*:operpassword:operuser:::K:
+O:*:operpassword:operuser::::
 """
 
 
@@ -77,7 +78,7 @@ class Irc2Controller(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 *faketime_cmd,
                 "ircd",
@@ -87,6 +88,7 @@ class Irc2Controller(BaseServerController, DirectoryBasedController):
                 "-f",
                 self.directory / "server.conf",
             ],
+            # stderr=subprocess.DEVNULL,
         )
 
 

irctest/controllers/ircu2.py

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

irctest/controllers/limnoria.py

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

irctest/controllers/mammon.py

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

irctest/controllers/ngircd.py

@@ -1,4 +1,5 @@
 import shutil
+import subprocess
 from typing import Optional, Set, Type
 
 from irctest.basecontrollers import BaseServerController, DirectoryBasedController
@@ -14,7 +15,7 @@ TEMPLATE_CONFIG = """
     {password_field}
 
 [Server]
-    Name = My.Little.Services
+    Name = services.example.org
     MyPassword = password
     PeerPassword = password
     Passive = yes  # don't connect to it
@@ -94,7 +95,7 @@ class NgircdController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 *faketime_cmd,
                 "ngircd",
@@ -102,6 +103,7 @@ 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 = "My.Little.Services";
+    name = "services.example.org";
     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 = "My.Little.Services";
+    name = "services.example.org";
 }};
 
 auth {{

irctest/controllers/sable.py

@@ -14,7 +14,6 @@ from irctest.basecontrollers import (
     NotImplementedByController,
 )
 from irctest.cases import BaseServerTestCase
-from irctest.client_mock import ClientMock
 from irctest.exceptions import NoMessageException
 from irctest.patma import ANYSTR
 
@@ -108,8 +107,6 @@ NETWORK_CONFIG = """
 
 NETWORK_CONFIG_CONFIG = """
 {
-    "object_expiry": 300,
-
     "opers": [
         {
             "name": "operuser",
@@ -397,7 +394,7 @@ class SableController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 *faketime_cmd,
                 "sable_ircd",
@@ -478,7 +475,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 = self.execute(
+        self.proc = subprocess.Popen(
             [
                 "sable_services",
                 "--foreground",
@@ -497,53 +494,6 @@ class SableServicesController(BaseServicesController):
         os.killpg(self.pgroup_id, signal.SIGKILL)
         super().kill_proc()
 
-    def wait_for_services(self) -> None:
-        # by default, wait_for_services() connects a user that sends a HELP command
-        # to NickServ and assumes services are up when it receives a non-ERR_NOSUCHNICK
-        # reply.
-        # However, with Sable, NickServ is always up, even when services are not linked,
-        # so we need to check a different way. We check presence of a non-EXTERNAL
-        # value to the sasl capability, but LINKS would
-        if self.services_up:
-            # Don't check again if they are already available
-            return
-        self.server_controller.wait_for_port()
-
-        c = ClientMock(name="chkSvs", show_io=True)
-        c.connect(self.server_controller.hostname, self.server_controller.port)
-        c.sendLine("NICK chkSvs")
-        c.sendLine("USER chk chk chk chk")
-        time.sleep(self.server_controller.sync_sleep_time)
-        got_end_of_motd = False
-        while not got_end_of_motd:
-            for msg in c.getMessages(synchronize=False):
-                if msg.command == "PING":
-                    # Hi Unreal
-                    c.sendLine("PONG :" + msg.params[0])
-                if msg.command in ("376", "422"):  # RPL_ENDOFMOTD / ERR_NOMOTD
-                    got_end_of_motd = True
-
-        timeout = time.time() + 10
-        while not self.services_up:
-            if time.time() > timeout:
-                raise Exception("Timeout while waiting for services")
-            c.sendLine("CAP LS 302")
-
-            msgs = self.getNickServResponse(c, timeout=1)
-            for msg in msgs:
-                if msg.command == "CAP":
-                    pass
-                for token in msg.params[-1].split():
-                    if token.startswith("sasl="):
-                        if "PLAIN" in token.removeprefix("sasl=").split(","):
-                            # SASL PLAIN is available, so services are linked.
-                            self.services_up = True
-                            break
-
-        c.sendLine("QUIT")
-        c.getMessages()
-        c.disconnect()
-
 
 def get_irctest_controller_class() -> Type[SableController]:
     return SableController

irctest/controllers/snircd.py

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

irctest/controllers/sopel.py

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

irctest/controllers/thelounge.py

@@ -1,5 +1,6 @@
 import json
 import os
+import subprocess
 from typing import Optional, Type
 
 from irctest import authentication, tls
@@ -95,7 +96,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 = self.execute(
+        self.proc = subprocess.Popen(
             [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 My.Little.Services {{
+link services.example.org {{
     incoming {{
         mask *;
     }}
@@ -72,11 +72,11 @@ link My.Little.Services {{
     class servers;
 }}
 ulines {{
-    My.Little.Services;
+    services.example.org;
 }}
 
 set {{
-    sasl-server My.Little.Services;
+    sasl-server services.example.org;
     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 = self.execute(
+            self.proc = subprocess.Popen(
                 [
                     *faketime_cmd,
                     "unrealircd",
@@ -270,6 +270,7 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
                     "-f",
                     self.directory / "unrealircd.conf",
                 ],
+                # stdout=subprocess.DEVNULL,
             )
             self.wait_for_port()
 

irctest/server_tests/bouncer.py

@@ -12,8 +12,9 @@ from irctest.patma import ANYSTR, StrRe
 
 @cases.mark_services
 class BouncerTestCase(cases.BaseServerTestCase):
-    def setUp(self):
+    @cases.mark_specifications("Ergo")
-        super().setUp()
+    def testBouncer(self):
+        """Test basic bouncer functionality."""
         self.controller.registerUser(self, "observer", "observerpassword")
         self.controller.registerUser(self, "testuser", "mypassword")
 
@@ -32,27 +33,13 @@ class BouncerTestCase(cases.BaseServerTestCase):
         self.sendLine(2, "USER a 0 * a")
         self.sendLine(2, "CAP REQ :server-time message-tags")
         self.sendLine(2, "CAP END")
-        self._waitForWelcome(2, "testnick")
+        messages = self.getMessages(2)
+        welcomes = [message for message in messages if message.command == RPL_WELCOME]
+        self.assertEqual(len(welcomes), 1)
+        # should see a regburst for testnick
+        self.assertMessageMatch(welcomes[0], params=["testnick", ANYSTR])
         self.joinChannel(2, "#chan")
 
-    def _waitForWelcome(self, client, nick):
-        """Waits for numeric 001, and returns every message after that."""
-        while True:
-            messages = iter(self.getMessages(client, synchronize=False))
-            for message in messages:
-                if message.command == "001":
-                    # should see a regburst for testnick
-                    self.assertMessageMatch(message, params=[nick, ANYSTR])
-
-                    messages_after_welcome = list(messages)
-                    messages_after_welcome += self.getMessages(client)
-
-                    # check there is no other 001
-                    for message in messages_after_welcome:
-                        self.assertNotEqual(message.command, "001")
-                    return messages_after_welcome
-
-    def _connectClient3(self):
         self.addClient()
         self.sendLine(3, "CAP LS 302")
         self.sendLine(3, "AUTHENTICATE PLAIN")
@@ -61,37 +48,49 @@ class BouncerTestCase(cases.BaseServerTestCase):
         self.sendLine(3, "USER a 0 * a")
         self.sendLine(3, "CAP REQ :server-time message-tags account-tag")
         self.sendLine(3, "CAP END")
+        messages = self.getMessages(3)
+        welcomes = [message for message in messages if message.command == RPL_WELCOME]
+        self.assertEqual(len(welcomes), 1)
         # should see the *same* regburst for testnick
-        messages = self._waitForWelcome(3, "testnick")
+        self.assertMessageMatch(welcomes[0], params=["testnick", ANYSTR])
         joins = [message for message in messages if message.command == "JOIN"]
         # we should be automatically joined to #chan
         self.assertMessageMatch(joins[0], params=["#chan"])
 
-    def _connectClient4(self):
+        # disable multiclient in nickserv
-        # connect a client similar to 3, but without the message-tags and account-tag
+        self.sendLine(3, "NS SET MULTICLIENT OFF")
-        # capabilities, to make sure it does not receive the associated tags
+        self.getMessages(3)
+
         self.addClient()
         self.sendLine(4, "CAP LS 302")
         self.sendLine(4, "AUTHENTICATE PLAIN")
         self.sendLine(4, sasl_plain_blob("testuser", "mypassword"))
         self.sendLine(4, "NICK testnick")
         self.sendLine(4, "USER a 0 * a")
-        self.sendLine(4, "CAP REQ server-time")
+        self.sendLine(4, "CAP REQ :server-time message-tags")
         self.sendLine(4, "CAP END")
-        # should see the *same* regburst for testnick
+        # with multiclient disabled, we should not be able to attach to the nick
-        self._waitForWelcome(4, "testnick")
+        messages = self.getMessages(4)
+        welcomes = [message for message in messages if message.command == RPL_WELCOME]
+        self.assertEqual(len(welcomes), 0)
+        errors = [
+            message for message in messages if message.command == ERR_NICKNAMEINUSE
+        ]
+        self.assertEqual(len(errors), 1)
 
-    @cases.mark_specifications("Ergo", "Sable")
+        self.sendLine(3, "NS SET MULTICLIENT ON")
-    def testAutomaticResumption(self):
+        self.getMessages(3)
-        """Test logging into an account that already has a client joins the client's session"""
+        self.addClient()
-        self._connectClient3()
+        self.sendLine(5, "CAP LS 302")
-
+        self.sendLine(5, "AUTHENTICATE PLAIN")
-    @cases.mark_specifications("Ergo", "Sable")
+        self.sendLine(5, sasl_plain_blob("testuser", "mypassword"))
-    def testChannelMessageFromOther(self):
+        self.sendLine(5, "NICK testnick")
-        """Test that all clients attached to a session get messages sent by someone else
+        self.sendLine(5, "USER a 0 * a")
-        to a channel"""
+        self.sendLine(5, "CAP REQ server-time")
-        self._connectClient3()
+        self.sendLine(5, "CAP END")
-        self._connectClient4()
+        messages = self.getMessages(5)
+        welcomes = [message for message in messages if message.command == RPL_WELCOME]
+        self.assertEqual(len(welcomes), 1)
 
         self.sendLine(1, "@+clientOnlyTag=Value PRIVMSG #chan :hey")
         self.getMessages(1)
@@ -105,84 +104,22 @@ class BouncerTestCase(cases.BaseServerTestCase):
         self.assertEqual(len(messagesforthree), 1)
         messagefortwo = messagesfortwo[0]
         messageforthree = messagesforthree[0]
-        messageforfour = self.getMessage(4)
+        messageforfive = self.getMessage(5)
         self.assertMessageMatch(messagefortwo, params=["#chan", "hey"])
         self.assertMessageMatch(messageforthree, params=["#chan", "hey"])
-        self.assertMessageMatch(messageforfour, params=["#chan", "hey"])
+        self.assertMessageMatch(messageforfive, params=["#chan", "hey"])
         self.assertIn("time", messagefortwo.tags)
         self.assertIn("time", messageforthree.tags)
-        self.assertIn("time", messageforfour.tags)
+        self.assertIn("time", messageforfive.tags)
         # 3 has account-tag
         self.assertIn("account", messageforthree.tags)
         # should get same msgid
         self.assertEqual(messagefortwo.tags["msgid"], messageforthree.tags["msgid"])
-        # 4 only has server-time, shouldn't get account or msgid tags
+        # 5 only has server-time, shouldn't get account or msgid tags
-        self.assertNotIn("account", messageforfour.tags)
+        self.assertNotIn("account", messageforfive.tags)
-        self.assertNotIn("msgid", messageforfour.tags)
+        self.assertNotIn("msgid", messageforfive.tags)
-
-    @cases.mark_specifications("Ergo", "Sable")
-    def testChannelMessageFromSelf(self):
-        """Test that all clients attached to a session get messages sent by an other client
-
-        (TODO: check when the initial sender has echo-message too)"""
-        self._connectClient3()
-        self._connectClient4()
-
-        self.sendLine(2, "@+clientOnlyTag=Value PRIVMSG #chan :hey")
-        messagesfortwo = [
-            msg for msg in self.getMessages(2) if msg.command == "PRIVMSG"
-        ]
-        messagesforone = [
-            msg for msg in self.getMessages(1) if msg.command == "PRIVMSG"
-        ]
-        messagesforthree = [
-            msg for msg in self.getMessages(3) if msg.command == "PRIVMSG"
-        ]
-        self.assertEqual(len(messagesforone), 1)
-        self.assertEqual(len(messagesfortwo), 0)  # echo-message not enabled
-        self.assertEqual(len(messagesforthree), 1)
-        messageforone = messagesforone[0]
-        messageforthree = messagesforthree[0]
-        messageforfour = self.getMessage(4)
-        self.assertMessageMatch(messageforone, params=["#chan", "hey"])
-        self.assertMessageMatch(messageforthree, params=["#chan", "hey"])
-        self.assertMessageMatch(messageforfour, params=["#chan", "hey"])
-        self.assertIn("time", messageforone.tags)
-        self.assertIn("time", messageforthree.tags)
-        self.assertIn("time", messageforfour.tags)
-        # 3 has account-tag
-        self.assertIn("account", messageforthree.tags)
-        # should get same msgid
-        self.assertEqual(messageforone.tags["msgid"], messageforthree.tags["msgid"])
-        # 4 only has server-time, shouldn't get account or msgid tags
-        self.assertNotIn("account", messageforfour.tags)
-        self.assertNotIn("msgid", messageforfour.tags)
-
-    @cases.mark_specifications("Ergo", "Sable")
-    def testDirectMessageFromOther(self):
-        """Test that all clients attached to a session get copies of messages sent
-        by an other client of that session directly to an other user"""
-        self._connectClient3()
-        self._connectClient4()
-
-        self.sendLine(1, "PRIVMSG testnick :this is a direct message")
-        self.getMessages(1)
-        messagefortwo = [
-            msg for msg in self.getMessages(2) if msg.command == "PRIVMSG"
-        ][0]
-        messageforthree = [
-            msg for msg in self.getMessages(3) if msg.command == "PRIVMSG"
-        ][0]
-        self.assertEqual(messagefortwo.params, messageforthree.params)
-        self.assertEqual(messagefortwo.tags["msgid"], messageforthree.tags["msgid"])
-
-    @cases.mark_specifications("Ergo", "Sable")
-    def testDirectMessageFromSelf(self):
-        """Test that all clients attached to a session get copies of messages sent
-        by an other client of that session directly to an other user"""
-        self._connectClient3()
-        self._connectClient4()
 
+        # test that copies of sent messages go out to other sessions
         self.sendLine(2, "PRIVMSG observer :this is a direct message")
         self.getMessages(2)
         messageForRecipient = [
@@ -196,20 +133,10 @@ class BouncerTestCase(cases.BaseServerTestCase):
             messageForRecipient.tags["msgid"], copyForOtherSession.tags["msgid"]
         )
 
-    @cases.mark_specifications("Ergo", "Sable")
-    def testQuit(self):
-        """Test that a single client of a session does not make the whole user quit
-        (and is generally not visible to anyone else, not even their other sessions),
-        until the last client quits"""
-        self._connectClient3()
-        self._connectClient4()
         self.sendLine(2, "QUIT :two out")
-        quitLines = [
+        quitLines = [msg for msg in self.getMessages(2) if msg.command == "QUIT"]
-            msg for msg in self.getMessages(2) if msg.command in ("QUIT", "ERROR")
-        ]
         self.assertEqual(len(quitLines), 1)
-        if quitLines[0].command == "QUIT":
+        self.assertMessageMatch(quitLines[0], params=[StrRe(".*two out.*")])
-            self.assertMessageMatch(quitLines[0], params=[StrRe(".*two out.*")])
         # neither the observer nor the other attached session should see a quit here
         quitLines = [msg for msg in self.getMessages(1) if msg.command == "QUIT"]
         self.assertEqual(quitLines, [])
@@ -227,39 +154,13 @@ class BouncerTestCase(cases.BaseServerTestCase):
             messagesforthree[0], command="PRIVMSG", params=["#chan", "hey again"]
         )
 
-        self.sendLine(4, "QUIT :four out")
+        self.sendLine(5, "QUIT :five out")
-        self.getMessages(4)
+        self.getMessages(5)
         self.sendLine(3, "QUIT :three out")
-        quitLines = [
+        quitLines = [msg for msg in self.getMessages(3) if msg.command == "QUIT"]
-            msg for msg in self.getMessages(3) if msg.command in ("QUIT", "ERROR")
-        ]
         self.assertEqual(len(quitLines), 1)
-        if quitLines[0].command == "QUIT":
+        self.assertMessageMatch(quitLines[0], params=[StrRe(".*three out.*")])
-            self.assertMessageMatch(quitLines[0], params=[StrRe(".*three out.*")])
         # observer should see *this* quit
         quitLines = [msg for msg in self.getMessages(1) if msg.command == "QUIT"]
         self.assertEqual(len(quitLines), 1)
         self.assertMessageMatch(quitLines[0], params=[StrRe(".*three out.*")])
-
-    @cases.mark_specifications("Ergo")
-    def testDisableAutomaticResumption(self):
-        # disable multiclient in nickserv
-        self.sendLine(2, "NS SET MULTICLIENT OFF")
-        self.getMessages(2)
-
-        self.addClient()
-        self.sendLine(3, "CAP LS 302")
-        self.sendLine(3, "AUTHENTICATE PLAIN")
-        self.sendLine(3, sasl_plain_blob("testuser", "mypassword"))
-        self.sendLine(3, "NICK testnick")
-        self.sendLine(3, "USER a 0 * a")
-        self.sendLine(3, "CAP REQ :server-time message-tags")
-        self.sendLine(3, "CAP END")
-        # with multiclient disabled, we should not be able to attach to the nick
-        messages = self.getMessages(3)
-        welcomes = [message for message in messages if message.command == RPL_WELCOME]
-        self.assertEqual(len(welcomes), 0)
-        errors = [
-            message for message in messages if message.command == ERR_NICKNAMEINUSE
-        ]
-        self.assertEqual(len(errors), 1)

irctest/server_tests/chmodes/ban.py

@@ -7,14 +7,18 @@ and ban exception (`Modern <https://modern.ircdocs.horse/#exception-channel-mode
 """
 
 from irctest import cases, runner
-from irctest.numerics import ERR_BANNEDFROMCHAN, RPL_BANLIST, RPL_ENDOFBANLIST
+from irctest.numerics import (
+    ERR_BANNEDFROMCHAN,
+    ERR_CANNOTSENDTOCHAN,
+    RPL_BANLIST,
+    RPL_ENDOFBANLIST,
+)
 from irctest.patma import ANYSTR, StrRe
 
 
 class BanModeTestCase(cases.BaseServerTestCase):
     @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
-    def testBan(self):
+    def testBanJoin(self):
-        """Basic ban operation"""
         self.connectClient("chanop", name="chanop")
         self.joinChannel("chanop", "#chan")
         self.getMessages("chanop")
@@ -32,6 +36,55 @@ 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/chmodes/operator.py

@@ -71,34 +71,22 @@ class ChannelOperatorModeTestCase(cases.BaseServerTestCase):
             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.
+        """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)
+        # Modern: "If <target> is a channel that does not exist on the network,
+        # the ERR_NOSUCHCHANNEL (403) numeric is returned."
+        # However, Unreal and ngircd send 401 ERR_NOSUCHNICK here instead:
+        if self.controller.software_name not in ("UnrealIRCd", "ngIRCd"):
+            self.assertEqual(messages[0].command, ERR_NOSUCHCHANNEL)
+        else:
+            self.assertIn(messages[0].command, [ERR_NOSUCHCHANNEL, ERR_NOSUCHNICK])
 
     @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."""
@@ -109,7 +97,7 @@ class ChannelOperatorModeTestCase(cases.BaseServerTestCase):
         self.assertEqual(len(messages), 1)
         self.assertIn(
             messages[0].command,
-            [ERR_NOSUCHCHANNEL, ERR_NOTONCHANNEL, ERR_USERNOTINCHANNEL],
+            [ERR_NOSUCHCHANNEL, ERR_NOTONCHANNEL, ERR_NOSUCHNICK, ERR_USERNOTINCHANNEL],
         )
 
     @cases.mark_specifications("Modern")

irctest/server_tests/kill.py

@@ -1,67 +0,0 @@
-"""
-The KILL command  (`Modern <https://modern.ircdocs.horse/#kill-message>`__)
-"""
-
-
-from irctest import cases
-from irctest.numerics import ERR_NOPRIVILEGES, RPL_YOUREOPER
-
-
-class KillTestCase(cases.BaseServerTestCase):
-    @cases.mark_specifications("Modern")
-    @cases.xfailIfSoftware(["Sable"], "https://github.com/Libera-Chat/sable/issues/154")
-    def testKill(self):
-        self.connectClient("ircop", name="ircop")
-        self.connectClient("alice", name="alice")
-        self.connectClient("bob", name="bob")
-
-        self.sendLine("ircop", "OPER operuser operpassword")
-        self.assertIn(
-            RPL_YOUREOPER,
-            [m.command for m in self.getMessages("ircop")],
-            fail_msg="OPER failed",
-        )
-
-        self.sendLine("alice", "KILL bob :some arbitrary reason")
-        self.assertIn(
-            ERR_NOPRIVILEGES,
-            [m.command for m in self.getMessages("alice")],
-            fail_msg="unprivileged KILL not rejected",
-        )
-        # bob is not killed
-        self.getMessages("bob")
-
-        self.sendLine("alice", "KILL alice :some arbitrary reason")
-        self.assertIn(
-            ERR_NOPRIVILEGES,
-            [m.command for m in self.getMessages("alice")],
-            fail_msg="unprivileged KILL not rejected",
-        )
-        # alice is not killed
-        self.getMessages("alice")
-
-        # privileged KILL should succeed
-        self.sendLine("ircop", "KILL alice :some arbitrary reason")
-        self.getMessages("ircop")
-        self.assertDisconnected("alice")
-
-        self.sendLine("ircop", "KILL bob :some arbitrary reason")
-        self.getMessages("ircop")
-        self.assertDisconnected("bob")
-
-    @cases.mark_specifications("Ergo")
-    def testKillOneArgument(self):
-        self.connectClient("ircop", name="ircop")
-        self.connectClient("alice", name="alice")
-
-        self.sendLine("ircop", "OPER operuser operpassword")
-        self.assertIn(
-            RPL_YOUREOPER,
-            [m.command for m in self.getMessages("ircop")],
-            fail_msg="OPER failed",
-        )
-
-        # 1-argument kill command, accepted by Ergo and some implementations
-        self.sendLine("ircop", "KILL alice")
-        self.getMessages("ircop")
-        self.assertDisconnected("alice")

irctest/server_tests/links.py

@@ -3,13 +3,6 @@ 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):
@@ -63,7 +56,7 @@ class LinksTestCase(cases.BaseServerTestCase):
                 "nick",
                 "My.Little.Server",
                 "My.Little.Server",
-                StrRe(f"0 (0042 )?{_server_info_regexp(self)}"),
+                StrRe("0 (0042 )?test server"),
             ],
         )
 
@@ -117,7 +110,7 @@ class ServicesLinksTestCase(cases.BaseServerTestCase):
             # This server redacts links
             return
 
-        messages.sort(key=lambda m: tuple(m.params))
+        messages.sort(key=lambda m: m.params[-1])
 
         self.assertMessageMatch(
             messages.pop(0),
@@ -126,7 +119,7 @@ class ServicesLinksTestCase(cases.BaseServerTestCase):
                 "nick",
                 "My.Little.Server",
                 "My.Little.Server",
-                StrRe(f"0 (0042 )?{_server_info_regexp(self)}"),
+                StrRe("0 (0042 )?test server"),
             ],
         )
         self.assertMessageMatch(
@@ -134,9 +127,9 @@ class ServicesLinksTestCase(cases.BaseServerTestCase):
             command=RPL_LINKS,
             params=[
                 "nick",
-                "My.Little.Services",
+                "services.example.org",
                 "My.Little.Server",
-                StrRe("[01] .+"),  # SID instead of description for Anope...
+                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/whois.py

@@ -221,6 +221,7 @@ 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")

irctest/specifications.py

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

make_workflows.py

@@ -223,9 +223,6 @@ 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 "

mypy.ini

@@ -1,5 +1,5 @@
 [mypy]
-python_version = 3.9
+python_version = 3.8
 warn_return_any = True
 warn_unused_configs = True
 

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 "

pytest.ini

@@ -8,7 +8,6 @@ markers =
     modern
     ircdocs
     Ergo
-    Sable
 
     # misc marks
     strict

workflows.yml

@@ -33,9 +33,6 @@ software:
             devel: "8.2.x"
             devel_release: null
         path: ircd-hybrid
-        pre_deps:
-            - name: "Install system dependencies"
-              run: "sudo apt-get install atheme-services faketime libjansson-dev"
         separate_build_job: true
         build_script: |
             cd $GITHUB_WORKSPACE/ircd-hybrid/
@@ -100,7 +97,7 @@ software:
         name: Bahamut
         repository: DALnet/Bahamut
         refs:
-            stable: "v2.2.4"
+            stable: "v2.2.1"
             release: null
             devel: "master"
             devel_release: null
@@ -139,7 +136,7 @@ software:
         pre_deps:
             - uses: actions/setup-go@v3
               with:
-                  go-version: '^1.24.0'
+                  go-version: '^1.22.0'
             - run: go version
         separate_build_job: false
         build_script: |
@@ -233,7 +230,7 @@ software:
         name: ngircd
         repository: ngircd/ngircd
         refs:
-            stable: acf8409c60ccc96beed0a1f990c4f9374823c0ce # three months ahead of v27
+            stable: 3e3f6cbeceefd9357b53b27c2386bb39306ab353 # three years ahead of rel-26.1
             release: null
             devel: master
             devel_release: null
@@ -252,7 +249,7 @@ software:
         name: Sable
         repository: Libera-Chat/sable
         refs:
-            stable: baed3ef9ac4550dc36a45b758436769e82e8ec58
+            stable: e9701e5e8d0c4f278ddd61ce7285f4918ecf99e9
             release: null
             devel: master
             devel_release: null
@@ -303,8 +300,8 @@ software:
         name: UnrealIRCd 6
         repository: unrealircd/unrealircd
         refs:
-            stable: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
+            stable: da3c1c654481a33035b9c703957e1c25d0158259  # 6.0.7
-            release: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
+            release: da3c1c654481a33035b9c703957e1c25d0158259  # 6.0.7
             devel: unreal60_dev
             devel_release: null
         path: unrealircd