Enable bouncer tests for Sable

This should fix some flakiness.

.github/workflows/lint.yml

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

.github/workflows/test-devel.yml

@@ -120,6 +120,8 @@ 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/
@@ -453,7 +455,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         bahamut
       timeout-minutes: 30
@@ -492,7 +496,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH   make
         bahamut-anope
       timeout-minutes: 30
@@ -525,7 +531,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         bahamut-atheme
       timeout-minutes: 30
@@ -552,7 +560,7 @@ jobs:
         repository: ergochat/ergo
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.22.0
+        go-version: ^1.24.0
     - run: go version
     - name: Build Ergo
       run: |
@@ -565,7 +573,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/go/sbin:~/go/bin:~/go:$PATH
         make ergo
       timeout-minutes: 30
@@ -604,7 +614,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH   make
         hybrid
       timeout-minutes: 30
@@ -637,7 +649,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
         make inspircd
       timeout-minutes: 30
@@ -676,7 +690,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH  make
         inspircd-anope
       timeout-minutes: 30
@@ -715,7 +731,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         ircu2
       timeout-minutes: 30
@@ -743,7 +761,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         limnoria
       timeout-minutes: 30
@@ -781,7 +801,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         nefarious
       timeout-minutes: 30
@@ -814,7 +836,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH
         make ngircd
       timeout-minutes: 30
@@ -853,7 +877,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH  make
         ngircd-anope
       timeout-minutes: 30
@@ -886,7 +912,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH
         make ngircd-atheme
       timeout-minutes: 30
@@ -925,7 +953,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH   make
         plexus4
       timeout-minutes: 30
@@ -972,7 +1002,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
         make sable
       timeout-minutes: 30
@@ -1005,7 +1037,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         solanum
       timeout-minutes: 30
@@ -1032,7 +1066,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         sopel
       timeout-minutes: 30
@@ -1070,7 +1106,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  make
         thelounge
       timeout-minutes: 30
@@ -1103,7 +1141,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd
       timeout-minutes: 30
@@ -1136,7 +1176,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd-5
       timeout-minutes: 30
@@ -1175,7 +1217,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH  make
         unrealircd-anope
       timeout-minutes: 30
@@ -1208,7 +1252,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd-atheme
       timeout-minutes: 30
@@ -1252,7 +1298,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/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,7 +126,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
         make inspircd
       timeout-minutes: 30
@@ -165,7 +167,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH  make
         inspircd-anope
       timeout-minutes: 30
@@ -198,7 +202,9 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - name: Test with pytest
+    - env:
+        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
+      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
         make inspircd-atheme
       timeout-minutes: 30

.github/workflows/test-stable.yml

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

Makefile

@@ -84,15 +84,12 @@ LIMNORIA_SELECTORS := \
 	$(EXTRA_SELECTORS)
 
 # Tests marked with arbitrary_client_tags or react_tag can't pass because Sable does not support client tags yet
-# Tests marked with private_chathistory can't pass because Sable does not implement CHATHISTORY for DMs
-
 SABLE_SELECTORS := \
 	not Ergo \
 	and not deprecated \
 	and not strict \
 	and not arbitrary_client_tags \
 	and not react_tag \
-	and not private_chathistory \
 	and not list and not lusers and not time and not info \
 	$(EXTRA_SELECTORS)
 

irctest/basecontrollers.py

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

irctest/controllers/anope_services.py

@@ -8,7 +8,7 @@ from irctest.basecontrollers import BaseServicesController, DirectoryBasedContro
 
 TEMPLATE_CONFIG = """
 serverinfo {{
-    name = "services.example.org"
+    name = "My.Little.Services"
     description = "Anope IRC Services"
     numeric = "00A"
     pid = "services.pid"
@@ -66,8 +66,13 @@ options {{
     warningtimeout = 4h
 }}
 
-module {{ name = "{module_prefix}sasl" }}
+module {{ name = "ns_sasl" }} # since 2.1.13
-module {{ name = "enc_bcrypt" }}
+module {{ name = "sasl" }}    # 2.1.2 to 2.1.12
+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" }}
 
 """
@@ -123,7 +128,6 @@ 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_",
                 )
             )
 
@@ -136,16 +140,19 @@ class AnopeController(BaseServicesController, DirectoryBasedController):
             Path(services_path).parent.parent / "modules"
         )
 
-        self.proc = subprocess.Popen(
+        extra_args = []
+        if self.debug_mode:
+            extra_args.append("--debug")
+
+        self.proc = self.execute(
             [
                 "anope",
                 "--config=services.conf",  # can't be an absolute path in 2.0
                 "--nofork",  # don't fork
                 "--nopid",  # don't write a pid
+                *extra_args,
             ],
             cwd=self.directory,
-            # stdout=subprocess.DEVNULL,
-            # stderr=subprocess.DEVNULL,
         )
 
 

irctest/controllers/atheme_services.py

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

irctest/controllers/bahamut.py

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

irctest/controllers/base_hybrid.py

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

irctest/controllers/charybdis.py

@@ -44,7 +44,7 @@ channel {{
     displayed_usercount = 0;
 }};
 
-connect "services.example.org" {{
+connect "My.Little.Services" {{
     host = "localhost";  # Used to validate incoming connection
     port = 0;  # We don't need servers to connect to services
     send_password = "password";
@@ -53,14 +53,14 @@ connect "services.example.org" {{
     flags = topicburst;
 }};
 service {{
-    name = "services.example.org";
+    name = "My.Little.Services";
 }};
 
 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:remoteban, oper:local_kill,
             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 "services.example.org";
+    services-name "My.Little.Services";
     admin-email "admin@example.org";
 }}
 
@@ -200,7 +200,7 @@ class DlkController(BaseServicesController, DirectoryBasedController):
             fd.write(TEMPLATE_DLK_WP_CONFIG.format(**template_vars))
         (dlk_conf_dir / "modules.conf").symlink_to(self.dlk_path / "conf/modules.conf")
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 "php",
                 "src/dalek",

irctest/controllers/ergo.py

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

irctest/controllers/girc.py

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

irctest/controllers/hybrid.py

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

irctest/controllers/inspircd.py

@@ -19,7 +19,7 @@ TEMPLATE_CONFIG = """
 
 <class
     name="ServerOperators"
-    commands="WALLOPS GLOBOPS"
+    commands="WALLOPS GLOBOPS KILL"
     privs="channels/auspex users/auspex channels/auspex servers/auspex"
     >
 <type
@@ -33,14 +33,15 @@ TEMPLATE_CONFIG = """
       class="ServerOperators"
       >
 
-<options casemapping="ascii">
+<options casemapping="ascii"
+         extbanformat="any">
 
 # Disable 'NOTICE #chan :*** foo invited bar into the channel-
 <security announceinvites="none">
 
 # Services:
 <bind address="{services_hostname}" port="{services_port}" type="servers">
-<link name="services.example.org"
+<link name="My.Little.Services"
     ipaddr="{services_hostname}"
     port="{services_port}"
     allowmask="*"
@@ -50,7 +51,7 @@ TEMPLATE_CONFIG = """
 <module name="spanningtree">
 <module name="hidechans">  # Anope errors when missing
 <sasl requiressl="no"
-      target="services.example.org">
+      target="My.Little.Services">
 
 # Protocol:
 <module name="banexception">
@@ -101,7 +102,7 @@ TEMPLATE_V4_CONFIG = """
 
 # HELP/HELPOP
 <module name="help">
-<include file="examples/help.conf.example">
+<include file="examples/help.example.conf">
 """
 
 
@@ -182,15 +183,22 @@ class InspircdController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        extra_args = []
+        if self.debug_mode:
+            if installed_version() >= 4:
+                extra_args.append("--protocoldebug")
+            else:
+                extra_args.append("--debug")
+
+        self.proc = self.execute(
             [
                 *faketime_cmd,
                 "inspircd",
                 "--nofork",
                 "--config",
                 self.directory / "server.conf",
+                *extra_args,
             ],
-            stdout=subprocess.DEVNULL,
         )
 
         if run_services:

irctest/controllers/irc2.py

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

irctest/controllers/ircu2.py

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

irctest/controllers/limnoria.py

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

irctest/controllers/mammon.py

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

irctest/controllers/ngircd.py

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

irctest/controllers/plexus4.py

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

irctest/controllers/sable.py

@@ -14,6 +14,7 @@ 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
 
@@ -107,6 +108,8 @@ NETWORK_CONFIG = """
 
 NETWORK_CONFIG_CONFIG = """
 {
+    "object_expiry": 300,
+
     "opers": [
         {
             "name": "operuser",
@@ -394,7 +397,7 @@ class SableController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 *faketime_cmd,
                 "sable_ircd",
@@ -408,6 +411,7 @@ class SableController(BaseServerController, DirectoryBasedController):
             ],
             cwd=self.directory,
             preexec_fn=os.setsid,
+            env={"RUST_BACKTRACE": "1", **os.environ},
         )
         self.pgroup_id = os.getpgid(self.proc.pid)
 
@@ -474,7 +478,7 @@ class SableServicesController(BaseServicesController):
         with self.server_controller.open_file("configs/services.conf") as fd:
             fd.write(SERVICES_CONFIG % self.server_controller.template_vars)
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 "sable_services",
                 "--foreground",
@@ -485,6 +489,7 @@ class SableServicesController(BaseServicesController):
             ],
             cwd=self.server_controller.directory,
             preexec_fn=os.setsid,
+            env={"RUST_BACKTRACE": "1", **os.environ},
         )
         self.pgroup_id = os.getpgid(self.proc.pid)
 
@@ -492,6 +497,53 @@ 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,5 +1,4 @@
 import shutil
-import subprocess
 from typing import Optional, Type
 
 from irctest.basecontrollers import (
@@ -96,7 +95,7 @@ class SnircdController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
             [
                 *faketime_cmd,
                 "ircd",
@@ -106,7 +105,6 @@ class SnircdController(BaseServerController, DirectoryBasedController):
                 "-x",
                 "DEBUG",
             ],
-            # stderr=subprocess.DEVNULL,
         )
 
 

irctest/controllers/sopel.py

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

irctest/controllers/thelounge.py

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

irctest/controllers/unrealircd.py

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

irctest/server_tests/bouncer.py

@@ -12,9 +12,8 @@ from irctest.patma import ANYSTR, StrRe
 
 @cases.mark_services
 class BouncerTestCase(cases.BaseServerTestCase):
-    @cases.mark_specifications("Ergo")
+    def setUp(self):
-    def testBouncer(self):
+        super().setUp()
-        """Test basic bouncer functionality."""
         self.controller.registerUser(self, "observer", "observerpassword")
         self.controller.registerUser(self, "testuser", "mypassword")
 
@@ -33,13 +32,27 @@ 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")
-        messages = self.getMessages(2)
+        self._waitForWelcome(2, "testnick")
-        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")
@@ -48,49 +61,37 @@ 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
-        self.assertMessageMatch(welcomes[0], params=["testnick", ANYSTR])
+        messages = self._waitForWelcome(3, "testnick")
         joins = [message for message in messages if message.command == "JOIN"]
         # we should be automatically joined to #chan
         self.assertMessageMatch(joins[0], params=["#chan"])
 
-        # disable multiclient in nickserv
+    def _connectClient4(self):
-        self.sendLine(3, "NS SET MULTICLIENT OFF")
+        # connect a client similar to 3, but without the message-tags and account-tag
-        self.getMessages(3)
+        # capabilities, to make sure it does not receive the associated tags
-
         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 message-tags")
+        self.sendLine(4, "CAP REQ server-time")
         self.sendLine(4, "CAP END")
-        # with multiclient disabled, we should not be able to attach to the nick
+        # should see the *same* regburst for testnick
-        messages = self.getMessages(4)
+        self._waitForWelcome(4, "testnick")
-        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)
 
-        self.sendLine(3, "NS SET MULTICLIENT ON")
+    @cases.mark_specifications("Ergo", "Sable")
-        self.getMessages(3)
+    def testAutomaticResumption(self):
-        self.addClient()
+        """Test logging into an account that already has a client joins the client's session"""
-        self.sendLine(5, "CAP LS 302")
+        self._connectClient3()
-        self.sendLine(5, "AUTHENTICATE PLAIN")
+
-        self.sendLine(5, sasl_plain_blob("testuser", "mypassword"))
+    @cases.mark_specifications("Ergo", "Sable")
-        self.sendLine(5, "NICK testnick")
+    def testChannelMessageFromOther(self):
-        self.sendLine(5, "USER a 0 * a")
+        """Test that all clients attached to a session get messages sent by someone else
-        self.sendLine(5, "CAP REQ server-time")
+        to a channel"""
-        self.sendLine(5, "CAP END")
+        self._connectClient3()
-        messages = self.getMessages(5)
+        self._connectClient4()
-        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)
@@ -104,22 +105,84 @@ class BouncerTestCase(cases.BaseServerTestCase):
         self.assertEqual(len(messagesforthree), 1)
         messagefortwo = messagesfortwo[0]
         messageforthree = messagesforthree[0]
-        messageforfive = self.getMessage(5)
+        messageforfour = self.getMessage(4)
         self.assertMessageMatch(messagefortwo, params=["#chan", "hey"])
         self.assertMessageMatch(messageforthree, params=["#chan", "hey"])
-        self.assertMessageMatch(messageforfive, params=["#chan", "hey"])
+        self.assertMessageMatch(messageforfour, params=["#chan", "hey"])
         self.assertIn("time", messagefortwo.tags)
         self.assertIn("time", messageforthree.tags)
-        self.assertIn("time", messageforfive.tags)
+        self.assertIn("time", messageforfour.tags)
         # 3 has account-tag
         self.assertIn("account", messageforthree.tags)
         # should get same msgid
         self.assertEqual(messagefortwo.tags["msgid"], messageforthree.tags["msgid"])
-        # 5 only has server-time, shouldn't get account or msgid tags
+        # 4 only has server-time, shouldn't get account or msgid tags
-        self.assertNotIn("account", messageforfive.tags)
+        self.assertNotIn("account", messageforfour.tags)
-        self.assertNotIn("msgid", messageforfive.tags)
+        self.assertNotIn("msgid", messageforfour.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 = [
@@ -133,9 +196,19 @@ 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 = [msg for msg in self.getMessages(2) if msg.command == "QUIT"]
+        quitLines = [
+            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.*")])
         # 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"]
@@ -154,13 +227,39 @@ class BouncerTestCase(cases.BaseServerTestCase):
             messagesforthree[0], command="PRIVMSG", params=["#chan", "hey again"]
         )
 
-        self.sendLine(5, "QUIT :five out")
+        self.sendLine(4, "QUIT :four out")
-        self.getMessages(5)
+        self.getMessages(4)
         self.sendLine(3, "QUIT :three out")
-        quitLines = [msg for msg in self.getMessages(3) if msg.command == "QUIT"]
+        quitLines = [
+            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.*")])
         # 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/modeis.py

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

irctest/server_tests/chmodes/operator.py

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

irctest/server_tests/kill.py

@@ -0,0 +1,67 @@
+"""
+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,6 +3,13 @@ from irctest.numerics import ERR_UNKNOWNCOMMAND, RPL_ENDOFLINKS, RPL_LINKS
 from irctest.patma import ANYSTR, StrRe
 
 
+def _server_info_regexp(case: cases.BaseServerTestCase) -> str:
+    if case.controller.software_name == "Sable":
+        return ".+"
+    else:
+        return "test server"
+
+
 class LinksTestCase(cases.BaseServerTestCase):
     @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
     def testLinksSingleServer(self):
@@ -56,7 +63,7 @@ class LinksTestCase(cases.BaseServerTestCase):
                 "nick",
                 "My.Little.Server",
                 "My.Little.Server",
-                StrRe("0 (0042 )?test server"),
+                StrRe(f"0 (0042 )?{_server_info_regexp(self)}"),
             ],
         )
 
@@ -110,7 +117,7 @@ class ServicesLinksTestCase(cases.BaseServerTestCase):
             # This server redacts links
             return
 
-        messages.sort(key=lambda m: m.params[-1])
+        messages.sort(key=lambda m: tuple(m.params))
 
         self.assertMessageMatch(
             messages.pop(0),
@@ -119,7 +126,7 @@ class ServicesLinksTestCase(cases.BaseServerTestCase):
                 "nick",
                 "My.Little.Server",
                 "My.Little.Server",
-                StrRe("0 (0042 )?test server"),
+                StrRe(f"0 (0042 )?{_server_info_regexp(self)}"),
             ],
         )
         self.assertMessageMatch(
@@ -127,9 +134,9 @@ class ServicesLinksTestCase(cases.BaseServerTestCase):
             command=RPL_LINKS,
             params=[
                 "nick",
-                "services.example.org",
+                "My.Little.Services",
                 "My.Little.Server",
-                StrRe("1 .+"),  # SID instead of description for Anope...
+                StrRe("[01] .+"),  # 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,7 +221,6 @@ class WhoisTestCase(_WhoisTestMixin, cases.BaseServerTestCase):
         )
 
     @cases.mark_specifications("RFC2812")
-    @cases.xfailIfSoftware(["Sable"], "https://github.com/Libera-Chat/sable/issues/101")
     def testWhoisMissingUser(self):
         """Test WHOIS on a nonexistent nickname."""
         self.connectClient("qux", name="qux")

irctest/specifications.py

@@ -9,6 +9,7 @@ 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,6 +223,9 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
             {
                 "name": "Test with pytest",
                 "timeout-minutes": 30,
+                "env": {
+                    "IRCTEST_DEBUG_LOGS": "${{ runner.debug }}",
+                },
                 "run": (
                     f"PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' "
                     f"PATH=$HOME/.local/bin:$PATH "

mypy.ini

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

pytest.ini

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

workflows.yml

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