Fix support for Anope >= Anope 2.1.12

Anope now rejects passwords too long for bcrypt to handle: d460b267e3
Make LINKS deterministic for Sable (#296 )
2025-04-05 06:49:47 +00:00 · 2025-01-26 20:20:25 +01:00 · 2024-12-30 21:07:33 +01:00 · 2024-12-28 22:54:57 +01:00 · 2024-12-28 20:30:37 +01:00 · 2024-12-28 20:30:37 +01:00
35 changed files with 492 additions and 142 deletions
--- a/.github/workflows/test-devel.yml
+++ b/.github/workflows/test-devel.yml
@ -453,7 +453,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 +494,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 +529,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 +558,7 @@ jobs:
        repository: ergochat/ergo
    - uses: actions/setup-go@v3
      with:
-        go-version: ^1.22.0
+        go-version: ^1.23.0
    - run: go version
    - name: Build Ergo
      run: |
@ -565,7 +571,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 +612,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 +647,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 +688,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 +729,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 +759,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 +799,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 +834,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 +875,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 +910,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 +951,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 +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=$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 +1035,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 +1064,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 +1104,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 +1139,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 +1174,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 +1215,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 +1250,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 +1296,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
--- a/.github/workflows/test-devel_release.yml
+++ b/.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
--- a/.github/workflows/test-stable.yml
+++ b/.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: |
@ -189,7 +189,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 +228,7 @@ jobs:
      uses: actions/checkout@v4
      with:
        path: ngircd
-        ref: 3e3f6cbeceefd9357b53b27c2386bb39306ab353
+        ref: acf8409c60ccc96beed0a1f990c4f9374823c0ce
        repository: ngircd/ngircd
    - name: Build ngircd
      run: |
@ -351,7 +351,7 @@ jobs:
      uses: actions/checkout@v4
      with:
        path: unrealircd
-        ref: da3c1c654481a33035b9c703957e1c25d0158259
+        ref: a68625454078641ce984eeb197f7e02b1857ab6c
        repository: unrealircd/unrealircd
    - name: Build UnrealIRCd 6
      run: |
@ -496,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
      timeout-minutes: 30
@ -535,7 +537,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 +572,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 +607,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 +636,7 @@ jobs:
        repository: ergochat/ergo
    - uses: actions/setup-go@v3
      with:
-        go-version: ^1.22.0
+        go-version: ^1.23.0
    - run: go version
    - name: Build Ergo
      run: |
@ -641,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=~/go/sbin:~/go/bin:~/go:$PATH
        make ergo
      timeout-minutes: 30
@ -680,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   make
        hybrid
      timeout-minutes: 30
@ -713,7 +725,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 +766,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 +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  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
        make inspircd-atheme
      timeout-minutes: 30
@ -835,7 +853,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 +894,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 +923,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 +963,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 +998,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 +1039,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 +1074,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 +1115,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 +1140,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 +1164,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 +1199,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 +1228,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 +1268,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 +1303,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 +1338,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 +1379,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 +1414,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
--- a/3
+++ b/3
@ -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)

--- a/irctest/basecontrollers.py
+++ b/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
--- a/irctest/controllers/anope_services.py
+++ b/irctest/controllers/anope_services.py
@ -8,7 +8,7 @@ from irctest.basecontrollers import BaseServicesController, DirectoryBasedContro

 TEMPLATE_CONFIG = """
 serverinfo {{
-    name = "services.example.org"
+    name = "My.Little.Services"
    description = "Anope IRC Services"
    numeric = "00A"
    pid = "services.pid"
@ -136,16 +136,19 @@ class AnopeController(BaseServicesController, DirectoryBasedController):
            Path(services_path).parent.parent / "modules"
        )

-        self.proc = subprocess.Popen(
+        extra_args = []
+        if self.debug_mode:
+            extra_args.append("--debug")
+
+        self.proc = self.execute(
            [
                "anope",
                "--config=services.conf",  # can't be an absolute path in 2.0
                "--nofork",  # don't fork
                "--nopid",  # don't write a pid
+                *extra_args,
            ],
            cwd=self.directory,
-            # stdout=subprocess.DEVNULL,
-            # stderr=subprocess.DEVNULL,
        )


--- a/irctest/controllers/atheme_services.py
+++ b/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(
--- a/irctest/controllers/bahamut.py
+++ b/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",
--- a/irctest/controllers/base_hybrid.py
+++ b/irctest/controllers/base_hybrid.py
@ -1,6 +1,5 @@
 from pathlib import Path
 import shutil
-import subprocess
 from typing import Optional

 from irctest.basecontrollers import BaseServerController, DirectoryBasedController
@ -74,7 +73,7 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
        else:
            faketime_cmd = []

-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
            [
                *faketime_cmd,
                self.binary_name,
@ -84,7 +83,6 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
                "-pidfile",
                self.directory / "server.pid",
            ],
-            # stderr=subprocess.DEVNULL,
        )

        if run_services:
--- a/irctest/controllers/charybdis.py
+++ b/irctest/controllers/charybdis.py
@ -44,7 +44,7 @@ channel {{
    displayed_usercount = 0;
 }};

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

 privset "omnioper" {{
--- a/irctest/controllers/dlk_services.py
+++ b/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",
--- a/irctest/controllers/ergo.py
+++ b/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"]
        )

--- a/irctest/controllers/girc.py
+++ b/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]:
--- a/irctest/controllers/hybrid.py
+++ b/irctest/controllers/hybrid.py
@ -42,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";
@ -50,7 +50,7 @@ connect {{
    class = "server";
 }};
 service {{
-    name = "services.example.org";
+    name = "My.Little.Services";
 }};

 auth {{
--- a/irctest/controllers/inspircd.py
+++ b/irctest/controllers/inspircd.py
@ -33,14 +33,15 @@ TEMPLATE_CONFIG = """
      class="ServerOperators"
      >

-<options casemapping="ascii">
+<options casemapping="ascii"
+         extbanformat="any">

 # Disable 'NOTICE #chan :*** foo invited bar into the channel-
 <security announceinvites="none">

 # Services:
 <bind address="{services_hostname}" port="{services_port}" type="servers">
-<link name="services.example.org"
+<link name="My.Little.Services"
    ipaddr="{services_hostname}"
    port="{services_port}"
    allowmask="*"
@ -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">
@ -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:
--- a/irctest/controllers/irc2.py
+++ b/irctest/controllers/irc2.py
@ -1,5 +1,4 @@
 import shutil
-import subprocess
 from typing import Optional, Type

 from irctest.basecontrollers import (
@ -78,7 +77,7 @@ class Irc2Controller(BaseServerController, DirectoryBasedController):
        else:
            faketime_cmd = []

-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
            [
                *faketime_cmd,
                "ircd",
@ -88,7 +87,6 @@ class Irc2Controller(BaseServerController, DirectoryBasedController):
                "-f",
                self.directory / "server.conf",
            ],
-            # stderr=subprocess.DEVNULL,
        )


--- a/irctest/controllers/ircu2.py
+++ b/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,
        )


--- a/irctest/controllers/limnoria.py
+++ b/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]:
--- a/irctest/controllers/mammon.py
+++ b/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",
--- a/irctest/controllers/ngircd.py
+++ b/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:
--- a/irctest/controllers/plexus4.py
+++ b/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 {{
--- a/irctest/controllers/sable.py
+++ b/irctest/controllers/sable.py
@ -107,6 +107,8 @@ NETWORK_CONFIG = """

 NETWORK_CONFIG_CONFIG = """
 {
+    "object_expiry": 300,
+
    "opers": [
        {
            "name": "operuser",
@ -394,7 +396,7 @@ class SableController(BaseServerController, DirectoryBasedController):
        else:
            faketime_cmd = []

-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
            [
                *faketime_cmd,
                "sable_ircd",
@ -475,7 +477,7 @@ class SableServicesController(BaseServicesController):
        with self.server_controller.open_file("configs/services.conf") as fd:
            fd.write(SERVICES_CONFIG % self.server_controller.template_vars)

-        self.proc = subprocess.Popen(
+        self.proc = self.execute(
            [
                "sable_services",
                "--foreground",
--- a/irctest/controllers/snircd.py
+++ b/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,
        )


--- a/irctest/controllers/sopel.py
+++ b/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]:
--- a/irctest/controllers/thelounge.py
+++ b/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)},
        )
--- a/irctest/controllers/unrealircd.py
+++ b/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()

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

--- a/irctest/server_tests/messages.py
+++ b/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):
--- a/irctest/server_tests/sasl.py
+++ b/irctest/server_tests/sasl.py
@ -82,7 +82,7 @@ class SaslTestCase(cases.BaseServerTestCase):
    @cases.mark_specifications("IRCv3")
    @cases.skipUnlessHasMechanism("PLAIN")
    def testPlainNonAscii(self):
-        password = "é" * 100
+        password = "é" * 30
        authstring = base64.b64encode(
            b"\x00".join([b"foo", b"foo", password.encode()])
        ).decode()
--- a/irctest/server_tests/whois.py
+++ b/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")
--- a/make_workflows.py
+++ b/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 "
--- a/patches/bahamut_localhost.patch
+++ b/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 "
--- a/workflows.yml
+++ b/workflows.yml
@ -97,7 +97,7 @@ software:
        name: Bahamut
        repository: DALnet/Bahamut
        refs:
-            stable: "v2.2.1"
+            stable: "v2.2.4"
            release: null
            devel: "master"
            devel_release: null
@ -136,7 +136,7 @@ software:
        pre_deps:
            - uses: actions/setup-go@v3
              with:
-                  go-version: '^1.22.0'
+                  go-version: '^1.23.0'
            - run: go version
        separate_build_job: false
        build_script: |
@ -148,7 +148,7 @@ software:
        name: InspIRCd
        repository: inspircd/inspircd
        refs: &inspircd_refs
-            stable: v3.17.0
+            stable: v3.17.1
            release: null
            devel: master
            devel_release: insp3
@ -230,7 +230,7 @@ software:
        name: ngircd
        repository: ngircd/ngircd
        refs:
-            stable: 3e3f6cbeceefd9357b53b27c2386bb39306ab353 # three years ahead of rel-26.1
+            stable: acf8409c60ccc96beed0a1f990c4f9374823c0ce # three months ahead of v27
            release: null
            devel: master
            devel_release: null
@ -249,7 +249,7 @@ software:
        name: Sable
        repository: Libera-Chat/sable
        refs:
-            stable: e9701e5e8d0c4f278ddd61ce7285f4918ecf99e9
+            stable: baed3ef9ac4550dc36a45b758436769e82e8ec58
            release: null
            devel: master
            devel_release: null
@ -300,8 +300,8 @@ software:
        name: UnrealIRCd 6
        repository: unrealircd/unrealircd
        refs:
-            stable: da3c1c654481a33035b9c703957e1c25d0158259  # 6.0.7
-            release: da3c1c654481a33035b9c703957e1c25d0158259  # 6.0.7
+            stable: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
+            release: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
            devel: unreal60_dev
            devel_release: null
        path: unrealircd
Author	SHA1	Message	Date
Valentin Lorentz	de17d2b2c0	Fix support for Anope >= Anope 2.1.12 Anope now rejects passwords too long for bcrypt to handle: `d460b267e3`	2025-01-26 20:20:25 +01:00
Val Lorentz	06e08b52be	Make LINKS deterministic for Sable (#296 )	2024-12-30 21:07:33 +01:00
Valentin Lorentz	54a1ab95ce	Relax testLinksWithServices for Sable	2024-12-28 22:54:57 +01:00
Val Lorentz	3e6d97ae42	Update Sable and make LINKS test support it	2024-12-28 20:30:37 +01:00
Val Lorentz	00c130d66c	Use consistent name for services server	2024-12-28 20:30:37 +01:00
Sadie Powell	2680502dfe	Allow any extban format on InspIRCd. (#294 ) This should stop the mute extban test failing when extbanformat is set to name (which will soon be the default in git master).	2024-11-03 10:24:05 +01:00
Stephen Bennett	d090f5455e	Update Sable and enable more test (#293 )	2024-10-28 18:15:10 +01:00
Val Lorentz	c31aaf4d61	Bump Bahamut (#291 ) The patch does not apply to the latest master, so we need to update it	2024-10-10 20:59:59 +02:00
Stephen Bennett	7b0ee7589f	sable: Add object_expiry setting to sable config, required since 015bcc4	2024-10-08 22:54:00 +02:00
Shivaram Lingamneni	d202e440bb	upgrade ergo's Go version to 1.23 (#289 ) https://github.com/ergochat/ergo/pull/2187	2024-08-16 08:30:52 +02:00
Val Lorentz	03ad671951	testLineTooLong: Ensure server processed incoming message before reading from the other client (#288 )	2024-08-15 20:34:16 +02:00
Val Lorentz	e3485b92b4	Bump UnrealIRCd and ngIRCd (#285 )	2024-07-27 18:14:57 +02:00
Sadie Powell	75d9040d37	Allow enabling debug output via environment variables. (#284 )	2024-07-24 20:35:37 +02:00
Shivaram Lingamneni	a132440789	add various channel mode tests (#276 )	2024-07-07 08:33:48 +02:00