Merge branch 'master' into named-modes

pytest-xdist (well, execnet) re-loads modules after forking, so each process
had its own lock, making the lock useless.

Co-authored-by: Shivaram Lingamneni <slingamn@cs.stanford.edu>

.github/workflows/test-devel.yml

@@ -157,6 +157,7 @@ jobs:
         # Insp3 <= 3.16.0 and Insp4 <= 4.0.0a21 don't support -DINSPIRCD_UNLIMITED_MAINLOOP
         patch src/inspircd.cpp < $GITHUB_WORKSPACE/patches/inspircd_mainloop.patch || true
 
+        wget https://raw.githubusercontent.com/progval/inspircd-contrib/namedmodes/4.0/m_ircv3_namedmodes.cpp -O src/modules/m_ircv3_namedmodes.cpp
         ./configure --prefix=$HOME/.local/inspircd --development
 
         CXXFLAGS=-DINSPIRCD_UNLIMITED_MAINLOOP make -j 4
@@ -402,6 +403,7 @@ jobs:
     - test-ngircd-anope
     - test-ngircd-atheme
     - test-plexus4
+    - test-sable
     - test-solanum
     - test-sopel
     - test-thelounge
@@ -570,7 +572,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/go/sbin:~/go/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/go/sbin:~/go/bin:~/go:$PATH
         make ergo
       timeout-minutes: 30
     - if: always()
@@ -642,7 +644,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
         make inspircd
       timeout-minutes: 30
     - if: always()
@@ -681,7 +683,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH  make
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH  make
         inspircd-anope
       timeout-minutes: 30
     - if: always()
@@ -819,7 +821,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH
         make ngircd
       timeout-minutes: 30
     - if: always()
@@ -858,7 +860,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:$PATH  make
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH  make
         ngircd-anope
       timeout-minutes: 30
     - if: always()
@@ -891,7 +893,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH
         make ngircd-atheme
       timeout-minutes: 30
     - if: always()
@@ -939,6 +941,53 @@ jobs:
       with:
         name: pytest-results_plexus4_devel
         path: pytest.xml
+  test-sable:
+    needs: []
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.11
+    - name: Checkout Sable
+      uses: actions/checkout@v3
+      with:
+        path: sable
+        ref: master
+        repository: Libera-Chat/sable
+    - name: Install rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        override: true
+        profile: minimal
+        toolchain: nightly
+    - name: Enable Cargo cache
+      uses: Swatinem/rust-cache@v2
+      with:
+        cache-on-failure: true
+        workspaces: sable -> target
+    - run: rustc --version
+    - name: Build Sable
+      run: |
+        cd $GITHUB_WORKSPACE/sable/
+        cargo build
+    - name: Install system dependencies
+      run: sudo apt-get install atheme-services faketime
+    - name: Install irctest dependencies
+      run: |-
+        python -m pip install --upgrade pip
+        pip install pytest pytest-xdist -r requirements.txt
+    - name: Test with pytest
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
+        make sable
+      timeout-minutes: 30
+    - if: always()
+      name: Publish results
+      uses: actions/upload-artifact@v3
+      with:
+        name: pytest-results_sable_devel
+        path: pytest.xml
   test-solanum:
     needs:
     - build-solanum
@@ -1061,7 +1110,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd
       timeout-minutes: 30
     - if: always()
@@ -1094,7 +1143,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd-5
       timeout-minutes: 30
     - if: always()
@@ -1133,7 +1182,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH  make
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH  make
         unrealircd-anope
       timeout-minutes: 30
     - if: always()
@@ -1166,7 +1215,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd-atheme
       timeout-minutes: 30
     - if: always()
@@ -1210,7 +1259,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' 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
         }}/wordpress-latest.zip" make unrealircd-dlk

.github/workflows/test-devel_release.yml

@@ -65,6 +65,7 @@ jobs:
         # Insp3 <= 3.16.0 and Insp4 <= 4.0.0a21 don't support -DINSPIRCD_UNLIMITED_MAINLOOP
         patch src/inspircd.cpp < $GITHUB_WORKSPACE/patches/inspircd_mainloop.patch || true
 
+        wget https://raw.githubusercontent.com/progval/inspircd-contrib/namedmodes/4.0/m_ircv3_namedmodes.cpp -O src/modules/m_ircv3_namedmodes.cpp
         ./configure --prefix=$HOME/.local/inspircd --development
 
         CXXFLAGS=-DINSPIRCD_UNLIMITED_MAINLOOP make -j 4
@@ -132,7 +133,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
         make inspircd
       timeout-minutes: 30
     - if: always()
@@ -171,7 +172,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH  make
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH  make
         inspircd-anope
       timeout-minutes: 30
     - if: always()
@@ -204,7 +205,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
         make inspircd-atheme
       timeout-minutes: 30
     - if: always()

.github/workflows/test-stable.yml

@@ -198,6 +198,7 @@ jobs:
         # Insp3 <= 3.16.0 and Insp4 <= 4.0.0a21 don't support -DINSPIRCD_UNLIMITED_MAINLOOP
         patch src/inspircd.cpp < $GITHUB_WORKSPACE/patches/inspircd_mainloop.patch || true
 
+        wget https://raw.githubusercontent.com/progval/inspircd-contrib/namedmodes/4.0/m_ircv3_namedmodes.cpp -O src/modules/m_ircv3_namedmodes.cpp
         ./configure --prefix=$HOME/.local/inspircd --development
 
         CXXFLAGS=-DINSPIRCD_UNLIMITED_MAINLOOP make -j 4
@@ -233,7 +234,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         path: ngircd
-        ref: rel-26.1
+        ref: 0714466af88d71d6c395629cd7fb624b099507d4
         repository: ngircd/ngircd
     - name: Build ngircd
       run: |
@@ -446,6 +447,7 @@ jobs:
     - test-ngircd-anope
     - test-ngircd-atheme
     - test-plexus4
+    - test-sable
     - test-solanum
     - test-sopel
     - test-thelounge
@@ -453,7 +455,6 @@ jobs:
     - test-unrealircd-5
     - test-unrealircd-anope
     - test-unrealircd-atheme
-    - test-unrealircd-dlk
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
@@ -647,7 +648,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/go/sbin:~/go/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/go/sbin:~/go/bin:~/go:$PATH
         make ergo
       timeout-minutes: 30
     - if: always()
@@ -719,7 +720,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
         make inspircd
       timeout-minutes: 30
     - if: always()
@@ -758,7 +759,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH  make
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH  make
         inspircd-anope
       timeout-minutes: 30
     - if: always()
@@ -791,7 +792,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
         make inspircd-atheme
       timeout-minutes: 30
     - if: always()
@@ -978,7 +979,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH
         make ngircd
       timeout-minutes: 30
     - if: always()
@@ -1017,7 +1018,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:$PATH  make
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH  make
         ngircd-anope
       timeout-minutes: 30
     - if: always()
@@ -1050,7 +1051,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH
         make ngircd-atheme
       timeout-minutes: 30
     - if: always()
@@ -1098,6 +1099,53 @@ jobs:
       with:
         name: pytest-results_plexus4_stable
         path: pytest.xml
+  test-sable:
+    needs: []
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.11
+    - name: Checkout Sable
+      uses: actions/checkout@v3
+      with:
+        path: sable
+        ref: ff1179512a79eba57ca468a5f83af84ecce08a5b
+        repository: Libera-Chat/sable
+    - name: Install rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        override: true
+        profile: minimal
+        toolchain: nightly
+    - name: Enable Cargo cache
+      uses: Swatinem/rust-cache@v2
+      with:
+        cache-on-failure: true
+        workspaces: sable -> target
+    - run: rustc --version
+    - name: Build Sable
+      run: |
+        cd $GITHUB_WORKSPACE/sable/
+        cargo build
+    - name: Install system dependencies
+      run: sudo apt-get install atheme-services faketime
+    - name: Install irctest dependencies
+      run: |-
+        python -m pip install --upgrade pip
+        pip install pytest pytest-xdist -r requirements.txt
+    - name: Test with pytest
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
+        make sable
+      timeout-minutes: 30
+    - if: always()
+      name: Publish results
+      uses: actions/upload-artifact@v3
+      with:
+        name: pytest-results_sable_stable
+        path: pytest.xml
   test-solanum:
     needs:
     - build-solanum
@@ -1220,7 +1268,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd
       timeout-minutes: 30
     - if: always()
@@ -1253,7 +1301,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd-5
       timeout-minutes: 30
     - if: always()
@@ -1292,7 +1340,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH  make
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH  make
         unrealircd-anope
       timeout-minutes: 30
     - if: always()
@@ -1325,7 +1373,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
         make unrealircd-atheme
       timeout-minutes: 30
     - if: always()
@@ -1334,52 +1382,6 @@ jobs:
       with:
         name: pytest-results_unrealircd-atheme_stable
         path: pytest.xml
-  test-unrealircd-dlk:
-    needs:
-    - build-unrealircd
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.11
-    - name: Download build artefacts
-      uses: actions/download-artifact@v3
-      with:
-        name: installed-unrealircd
-        path: '~'
-    - name: Unpack artefacts
-      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
-    - name: Checkout Dlk
-      uses: actions/checkout@v3
-      with:
-        path: Dlk-Services
-        ref: 6db51ea03f039c48fd20427c04cec8ff98df7878
-        repository: DalekIRC/Dalek-Services
-    - name: Build Dlk
-      run: |
-        pip install pifpaf
-        wget -q https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
-        wget -q https://wordpress.org/latest.zip -O wordpress-latest.zip
-    - name: Install system dependencies
-      run: sudo apt-get install atheme-services faketime
-    - name: Install irctest dependencies
-      run: |-
-        python -m pip install --upgrade pip
-        pip install pytest pytest-xdist -r requirements.txt
-    - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
-        IRCTEST_DLK_PATH="${{ github.workspace }}/Dlk-Services" IRCTEST_WP_CLI_PATH="${{
-        github.workspace }}/wp-cli.phar" IRCTEST_WP_ZIP_PATH="${{ github.workspace
-        }}/wordpress-latest.zip" make unrealircd-dlk
-      timeout-minutes: 30
-    - if: always()
-      name: Publish results
-      uses: actions/upload-artifact@v3
-      with:
-        name: pytest-results_unrealircd-dlk_stable
-        path: pytest.xml
 name: irctest with stable versions
 'on':
   pull_request: null

Makefile

@@ -35,22 +35,18 @@ INSPIRCD_SELECTORS := \
 	and not strict \
 	$(EXTRA_SELECTORS)
 
-# HelpTestCase fails because it returns NOTICEs instead of numerics
 IRCU2_SELECTORS := \
 	not Ergo \
 	and not deprecated \
 	and not strict \
 	$(EXTRA_SELECTORS)
 
-# same justification as ircu2
-# lusers "unregistered" tests fail because 
 NEFARIOUS_SELECTORS := \
 	not Ergo \
 	and not deprecated \
 	and not strict \
 	$(EXTRA_SELECTORS)
 
-# same justification as ircu2
 SNIRCD_SELECTORS := \
 	not Ergo \
 	and not deprecated \
@@ -87,6 +83,13 @@ LIMNORIA_SELECTORS := \
 	(foo or not foo) \
 	$(EXTRA_SELECTORS)
 
+SABLE_SELECTORS := \
+	not Ergo \
+	and not deprecated \
+	and not strict \
+	and not whowas and not list and not lusers and not userhost and not time and not info \
+	$(EXTRA_SELECTORS)
+
 SOLANUM_SELECTORS := \
 	not Ergo \
 	and not deprecated \
@@ -118,9 +121,9 @@ UNREALIRCD_SELECTORS := \
 	and not private_chathistory \
 	$(EXTRA_SELECTORS)
 
-.PHONY: all flakes bahamut charybdis ergo inspircd ircu2 snircd irc2 mammon nefarious limnoria sopel solanum unrealircd
+.PHONY: all flakes bahamut charybdis ergo inspircd ircu2 snircd irc2 mammon nefarious limnoria sable sopel solanum unrealircd
 
-all: flakes bahamut charybdis ergo inspircd ircu2 snircd irc2 mammon nefarious limnoria sopel solanum unrealircd
+all: flakes bahamut charybdis ergo inspircd ircu2 snircd irc2 mammon nefarious limnoria sable sopel solanum unrealircd
 
 flakes:
 	find irctest/ -name "*.py" -not -path "irctest/scram/*" -print0 | xargs -0 pyflakes3
@@ -249,6 +252,13 @@ ngircd-atheme:
 		-m 'services' \
 		-k "$(NGIRCD_SELECTORS)"
 
+sable:
+	$(PYTEST) $(PYTEST_ARGS) \
+		--controller=irctest.controllers.sable \
+		-n 20 \
+		-m 'not services' \
+		-k '$(SABLE_SELECTORS)'
+
 solanum:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller=irctest.controllers.solanum \

README.md

@@ -116,6 +116,9 @@ patch src/inspircd.cpp < ~/irctest/patches/inspircd_mainloop.patch
 # on Insp3 >= 3.17.0 and Insp4 >= 4.0.0a22:
 export CXXFLAGS=-DINSPIRCD_UNLIMITED_MAINLOOP
 
+# third-party module, used in named-modes tests because the spec is not implemented upstream
+wget https://raw.githubusercontent.com/progval/inspircd-contrib/namedmodes/4.0/m_ircv3_namedmodes.cpp -O src/modules/m_ircv3_namedmodes.cpp
+
 ./configure --prefix=$HOME/.local/ --development
 make -j 4
 make install

irctest/basecontrollers.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+import contextlib
 import dataclasses
-import multiprocessing
+import json
 import os
 from pathlib import Path
 import shutil
@@ -10,23 +11,13 @@ import subprocess
 import tempfile
 import textwrap
 import time
-from typing import (
+from typing import IO, Any, Callable, Dict, Iterator, List, Optional, Set, Tuple, Type
-    IO,
-    Any,
-    Callable,
-    Dict,
-    List,
-    MutableMapping,
-    Optional,
-    Set,
-    Tuple,
-    Type,
-)
 
 import irctest
 
 from . import authentication, tls
 from .client_mock import ClientMock
+from .irc_utils.filelock import FileLock
 from .irc_utils.junkdrawer import find_hostname_and_port
 from .irc_utils.message_parser import Message
 from .runner import NotImplementedByController
@@ -68,43 +59,39 @@ class _BaseController:
 
     supports_sts: bool
     supported_sasl_mechanisms: Set[str]
+
     proc: Optional[subprocess.Popen]
 
-    _used_ports: Set[Tuple[str, int]]
+    _used_ports_path = Path(tempfile.gettempdir()) / "irctest_ports.json"
-    """``(hostname, port))`` used by this controller."""
+    _port_lock = FileLock(Path(tempfile.gettempdir()) / "irctest_ports.json.lock")
-    # the following need to be shared between processes in case we are running in
-    # parallel (with pytest-xdist)
-    # The dicts are used as a set of (hostname, port), because _manager.set() doesn't
-    # exist.
-    _manager = multiprocessing.Manager()
-    _port_lock = _manager.Lock()
-    """Lock for access to ``_all_used_ports`` and ``_available_ports``."""
-    _all_used_ports: MutableMapping[Tuple[str, int], None] = _manager.dict()
-    """``(hostname, port)`` used by all controllers."""
-    _available_ports: MutableMapping[Tuple[str, int], None] = _manager.dict()
-    """``(hostname, port)`` available to any controller."""
 
     def __init__(self, test_config: TestCaseControllerConfig):
         self.test_config = test_config
         self.proc = None
-        self._used_ports = set()
+        self._own_ports: Set[Tuple[str, int]] = set()
+
+    @contextlib.contextmanager
+    def _used_ports(self) -> Iterator[Set[Tuple[str, int]]]:
+        with self._port_lock:
+            if not self._used_ports_path.exists():
+                self._used_ports_path.write_text("[]")
+            used_ports = {
+                (h, p) for (h, p) in json.loads(self._used_ports_path.read_text())
+            }
+            yield used_ports
+            self._used_ports_path.write_text(json.dumps(list(used_ports)))
 
     def get_hostname_and_port(self) -> Tuple[str, int]:
-        with self._port_lock:
+        with self._used_ports() as used_ports:
-            try:
-                # try to get a known available port
-                ((hostname, port), _) = self._available_ports.popitem()
-            except KeyError:
-                # if there aren't any, iterate while we get a fresh one.
             while True:
                 (hostname, port) = find_hostname_and_port()
-                    if (hostname, port) not in self._all_used_ports:
+                if (hostname, port) not in used_ports:
                     # double-checking in self._used_ports to prevent collisions
                     # between controllers starting at the same time.
                     break
 
-            # Make this port unavailable to other processes
+            used_ports.add((hostname, port))
-            self._all_used_ports[(hostname, port)] = None
+            self._own_ports.add((hostname, port))
 
         return (hostname, port)
 
@@ -130,10 +117,10 @@ class _BaseController:
         if self.proc:
             self.kill_proc()
 
-        # move this controller's ports from _all_used_ports to _available_ports
+        with self._used_ports() as used_ports:
-        for hostname, port in self._used_ports:
+            for hostname, port in list(self._own_ports):
-            del self._all_used_ports[(hostname, port)]
+                used_ports.remove((hostname, port))
-            self._available_ports[(hostname, port)] = None
+                self._own_ports.remove((hostname, port))
 
 
 class DirectoryBasedController(_BaseController):
@@ -248,6 +235,12 @@ class BaseServerController(_BaseController):
     extban_mute_char: Optional[str] = None
     """Character used for the 'mute' extban"""
     nickserv = "NickServ"
+    sync_sleep_time = 0.0
+    """How many seconds to sleep before clients synchronously get messages.
+
+    This can be 0 for servers answering all commands in order (all but Sable as of
+    this writing), as irctest emits a PING, waits for a PONG, and captures all messages
+    between the two."""
 
     def __init__(self, *args: Any, **kwargs: Any):
         super().__init__(*args, **kwargs)
@@ -296,7 +289,7 @@ class BaseServerController(_BaseController):
                         time.sleep(0.01)
 
                         c.send(b" ")  # Triggers BrokenPipeError
-                except BrokenPipeError:
+                except (BrokenPipeError, ConnectionResetError):
                     # ircu2 cuts the connection without a message if registration
                     # is not complete.
                     pass
@@ -350,13 +343,17 @@ class BaseServicesController(_BaseController):
         c.connect(self.server_controller.hostname, self.server_controller.port)
         c.sendLine("NICK chkNS")
         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])
-        c.getMessages()
+                if msg.command in ("376", "422"):  # RPL_ENDOFMOTD / ERR_NOMOTD
+                    got_end_of_motd = True
 
-        timeout = time.time() + 3
+        timeout = time.time() + 10
         while True:
             c.sendLine(f"PRIVMSG {self.server_controller.nickserv} :help")
 
@@ -365,10 +362,16 @@ class BaseServicesController(_BaseController):
                 if msg.command == "401":
                     # NickServ not available yet
                     pass
+                elif msg.command in ("MODE", "221"):  # RPL_UMODEIS
+                    pass
                 elif msg.command == "NOTICE":
+                    assert msg.prefix is not None
+                    if "!" not in msg.prefix and "." in msg.prefix:
+                        # Server notice
+                        pass
+                    else:
                         # NickServ is available
                         assert "nickserv" in (msg.prefix or "").lower(), msg
-                    print("breaking")
                         break
                 else:
                     assert False, f"unexpected reply from NickServ: {msg}"

irctest/cases.py

@@ -585,9 +585,13 @@ class BaseServerTestCase(
         del self.clients[name]
 
     def getMessages(self, client: TClientName, **kwargs: Any) -> List[Message]:
+        if kwargs.get("synchronize", True):
+            time.sleep(self.controller.sync_sleep_time)
         return self.clients[client].getMessages(**kwargs)
 
     def getMessage(self, client: TClientName, **kwargs: Any) -> Message:
+        if kwargs.get("synchronize", True):
+            time.sleep(self.controller.sync_sleep_time)
         return self.clients[client].getMessage(**kwargs)
 
     def getRegistrationMessage(self, client: TClientName) -> Message:
@@ -798,7 +802,7 @@ def xfailIf(
     def decorator(f: Callable[..., _TReturn]) -> Callable[..., _TReturn]:
         @functools.wraps(f)
         def newf(self: _TSelf, *args: Any, **kwargs: Any) -> _TReturn:
-            if condition(self):
+            if condition(self, *args, **kwargs):
                 try:
                     return f(self, *args, **kwargs)
                 except Exception:
@@ -815,7 +819,10 @@ def xfailIf(
 def xfailIfSoftware(
     names: List[str], reason: str
 ) -> Callable[[Callable[..., _TReturn]], Callable[..., _TReturn]]:
-    return xfailIf(lambda testcase: testcase.controller.software_name in names, reason)
+    def pred(testcase: _IrcTestCase, *args: Any, **kwargs: Any) -> bool:
+        return testcase.controller.software_name in names
+
+    return xfailIf(pred, reason)
 
 
 def mark_services(cls: TClass) -> TClass:

irctest/controllers/ergo.py

@@ -211,9 +211,6 @@ class ErgoController(BaseServerController, DirectoryBasedController):
         username: str,
         password: Optional[str] = None,
     ) -> None:
-        # XXX: Move this somewhere else when
-        # https://github.com/ircv3/ircv3-specifications/pull/152 becomes
-        # part of the specification
         if not case.run_services:
             # Ergo does not actually need this, but other controllers do, so we
             # are checking it here as well for tests that aren't tested with other

irctest/controllers/inspircd.py

@@ -68,6 +68,7 @@ TEMPLATE_CONFIG = """
 <module name="ircv3_invitenotify">
 <module name="ircv3_labeledresponse">
 <module name="ircv3_msgid">
+<module name="ircv3_namedmodes">  # third-party, https://github.com/progval/inspircd-contrib/blob/namedmodes/4.0/m_ircv3_namedmodes.cpp
 <module name="ircv3_servertime">
 <module name="monitor">
 <module name="m_muteban">  # for testing mute extbans

irctest/controllers/sable.py

@@ -0,0 +1,481 @@
+import os
+from pathlib import Path
+import shutil
+import signal
+import subprocess
+import tempfile
+import time
+from typing import Optional, Type
+
+from irctest.basecontrollers import (
+    BaseServerController,
+    BaseServicesController,
+    DirectoryBasedController,
+    NotImplementedByController,
+)
+from irctest.cases import BaseServerTestCase
+from irctest.exceptions import NoMessageException
+from irctest.patma import ANYSTR
+
+GEN_CERTS = """
+mkdir -p useless_openssl_data/
+
+cat > openssl.cnf <<EOF
+[ ca ]
+default_ca	= CA_default		# The default ca section
+
+[ CA_default ]
+new_certs_dir = useless_openssl_data/
+database = useless_openssl_data/db
+policy = policy_anything
+serial = useless_openssl_data/serial
+copy_extensions = copy
+email_in_dn = no
+rand_serial = no
+
+[ policy_anything ]
+countryName		       = optional
+stateOrProvinceName	   = optional
+localityName		   = optional
+organizationName	   = optional
+organizationalUnitName	= optional
+commonName		       = supplied
+emailAddress		   = optional
+
+[ usr_cert ]
+subjectAltName=subject:copy
+EOF
+
+rm -f useless_openssl_data/db
+touch useless_openssl_data/db
+echo 01 > useless_openssl_data/serial
+
+# Generate CA
+openssl req -x509 -nodes -newkey rsa:2048 -batch \
+    -subj "/CN=Test CA" \
+    -outform PEM -out ca_cert.pem \
+    -keyout ca_cert.key
+
+for server in $*; do
+    openssl genrsa -traditional \
+        -out $server.key \
+        2048
+    openssl req -nodes -batch -new \
+        -addext "subjectAltName = DNS:$server" \
+        -key $server.key \
+        -outform PEM -out server_$server.req
+    openssl ca -config openssl.cnf -days 3650 -md sha512 -batch \
+        -subj /CN=$server \
+        -keyfile ca_cert.key -cert ca_cert.pem \
+        -in server_$server.req \
+        -out $server.pem
+    openssl x509 -sha1 -in $server.pem -fingerprint -noout \
+        | sed "s/.*=//" | sed "s/://g" | tr '[:upper:]' '[:lower:]' > $server.pem.sha1
+done
+
+rm -r useless_openssl_data/
+"""
+
+_certs_dir = None
+
+
+def certs_dir() -> Path:
+    global _certs_dir
+    if _certs_dir is None:
+        certs_dir = tempfile.TemporaryDirectory()
+        (Path(certs_dir.name) / "gen_certs.sh").write_text(GEN_CERTS)
+        subprocess.run(
+            ["bash", "gen_certs.sh", "My.Little.Server", "My.Little.Services"],
+            cwd=certs_dir.name,
+            check=True,
+        )
+        _certs_dir = certs_dir
+    return Path(_certs_dir.name)
+
+
+NETWORK_CONFIG = """
+{
+    "fanout": 1,
+    "ca_file": "%(certs_dir)s/ca_cert.pem",
+
+    "peers": [
+        { "name": "My.Little.Services", "address": "%(services_hostname)s:%(services_port)s", "fingerprint": "%(services_cert_sha1)s" },
+        { "name": "My.Little.Server", "address": "%(server1_hostname)s:%(server1_port)s", "fingerprint": "%(server1_cert_sha1)s" }
+    ]
+}
+"""
+
+NETWORK_CONFIG_CONFIG = """
+{
+    "opers": [
+        {
+            "name": "operuser",
+            // echo -n "operpassword" | openssl passwd -6 -stdin
+            "hash": "$6$z5yA.OfGliDoi/R2$BgSsguS6bxAsPSCygDisgDw5JZuo5.88eU3Hyc7/4OaNpeKIxWGjOggeHzOl0xLiZg1vfwxXjOTFN14wG5vNI."
+        }
+    ],
+
+    "alias_users": [
+        {
+            "nick": "ChanServ",
+            "user": "ChanServ",
+            "host": "services.",
+            "realname": "Channel services compatibility layer",
+            "command_alias": "CS"
+        },
+        {
+            "nick": "NickServ",
+            "user": "NickServ",
+            "host": "services.",
+            "realname": "Account services compatibility layer",
+            "command_alias": "NS"
+        }
+    ],
+
+    "default_roles": {
+        "builtin:op": [
+            "always_send",
+            "op_self", "op_grant", "voice_self", "voice_grant",
+            "receive_op", "receive_voice", "receive_opmod",
+            "topic", "kick", "set_simple_mode", "set_key",
+            "rename",
+            "ban_view", "ban_add", "ban_remove_any",
+            "quiet_view", "quiet_add", "quiet_remove_any",
+            "exempt_view", "exempt_add", "exempt_remove_any",
+            "invite_self", "invite_other",
+            "invex_view", "invex_add", "invex_remove_any"
+        ],
+        "builtin:voice": [
+            "always_send",
+            "voice_self",
+            "receive_voice",
+            "ban_view", "quiet_view"
+        ],
+        "builtin:all": [
+            "ban_view", "quiet_view"
+        ]
+    },
+
+    "debug_mode": true
+}
+"""
+
+SERVER_CONFIG = """
+{
+    "server_id": 1,
+    "server_name": "My.Little.Server",
+
+    "management": {
+        "address": "%(server1_management_hostname)s:%(server1_management_port)s",
+        "client_ca": "%(certs_dir)s/ca_cert.pem",
+        "authorised_fingerprints": [
+            { "name": "user1", "fingerprint": "435bc6db9f22e84ba5d9652432154617c9509370" },
+        ],
+    },
+
+    "server": {
+        "listeners": [
+            { "address": "%(c2s_hostname)s:%(c2s_port)s" },
+        ],
+    },
+
+    "event_log": {
+        "event_expiry": 300, // five minutes, for local testing
+    },
+
+    "tls_config": {
+        "key_file": "%(certs_dir)s/My.Little.Server.key",
+        "cert_file": "%(certs_dir)s/My.Little.Server.pem",
+    },
+
+    "node_config": {
+        "listen_addr": "%(server1_hostname)s:%(server1_port)s",
+        "cert_file": "%(certs_dir)s/My.Little.Server.pem",
+        "key_file": "%(certs_dir)s/My.Little.Server.key",
+    },
+
+    "log": {
+        "dir": "log/server1/",
+
+        "module-levels": {
+            "": "debug",
+            "sable_ircd": "trace",
+        },
+
+        "targets": [
+            {
+                "target": "stdout",
+                "level": "trace",
+                "modules": [ "sable", "audit", "client_listener" ],
+            },
+        ],
+    },
+}
+"""
+
+SERVICES_CONFIG = """
+{
+    "server_id": 99,
+    "server_name": "My.Little.Services",
+
+    "management": {
+        "address": "%(services_management_hostname)s:%(services_management_port)s",
+        "client_ca": "%(certs_dir)s/ca_cert.pem",
+        "authorised_fingerprints": [
+            { "name": "user1", "fingerprint": "435bc6db9f22e84ba5d9652432154617c9509370" }
+        ]
+    },
+
+    "server": {
+        "database": "test_database.json",
+        "default_roles": {
+            "builtin:founder": [
+                "founder", "access_view", "access_edit", "role_view", "role_edit",
+                "op_self", "op_grant",
+                "voice_self", "voice_grant",
+                "always_send",
+                "invite_self", "invite_other",
+                "receive_op", "receive_voice", "receive_opmod",
+                "topic", "kick", "set_simple_mode", "set_key",
+                "rename",
+                "ban_view", "ban_add", "ban_remove_any",
+                "quiet_view", "quiet_add", "quiet_remove_any",
+                "exempt_view", "exempt_add", "exempt_remove_any",
+                "invex_view", "invex_add", "invex_remove_any"
+            ],
+            "builtin:op": [
+                "always_send",
+                "receive_op", "receive_voice", "receive_opmod",
+                "topic", "kick", "set_simple_mode", "set_key",
+                "rename",
+                "ban_view", "ban_add", "ban_remove_any",
+                "quiet_view", "quiet_add", "quiet_remove_any",
+                "exempt_view", "exempt_add", "exempt_remove_any",
+                "invex_view", "invex_add", "invex_remove_any"
+            ],
+            "builtin:voice": [
+                "always_send", "voice_self", "receive_voice"
+            ]
+        }
+    },
+
+    "event_log": {
+        "event_expiry": 300, // five minutes, for local testing
+    },
+
+    "tls_config": {
+        "key_file": "%(certs_dir)s/My.Little.Services.key",
+        "cert_file": "%(certs_dir)s/My.Little.Services.pem"
+    },
+
+    "node_config": {
+        "listen_addr": "%(services_hostname)s:%(services_port)s",
+        "cert_file": "%(certs_dir)s/My.Little.Services.pem",
+        "key_file": "%(certs_dir)s/My.Little.Services.key"
+    },
+
+    "log": {
+        "dir": "log/services/",
+
+        "module-levels": {
+            "": "debug"
+        },
+
+        "targets": [
+            {
+                "target": "stdout",
+                "level": "debug",
+                "modules": [ "sable_services" ]
+            }
+        ]
+    }
+}
+"""
+
+
+class SableController(BaseServerController, DirectoryBasedController):
+    software_name = "Sable"
+    supported_sasl_mechanisms = {"PLAIN"}
+    sync_sleep_time = 0.1
+    """Sable processes commands very quickly, but responses for commands changing the
+    state may be sent after later commands for messages which don't."""
+
+    def run(
+        self,
+        hostname: str,
+        port: int,
+        *,
+        password: Optional[str],
+        ssl: bool,
+        run_services: bool,
+        faketime: Optional[str],
+    ) -> None:
+        if password is not None:
+            raise NotImplementedByController("PASS command")
+        if ssl:
+            raise NotImplementedByController("SSL")
+        assert self.proc is None
+        self.port = port
+        self.create_config()
+
+        assert self.directory
+
+        (self.directory / "configs").mkdir()
+
+        c2s_hostname = hostname
+        c2s_port = port
+        del hostname, port
+        # base controller expects this to check for NickServ presence itself
+        self.hostname = c2s_hostname
+        self.port = c2s_port
+
+        (server1_hostname, server1_port) = self.get_hostname_and_port()
+        (services_hostname, services_port) = self.get_hostname_and_port()
+
+        # Sable requires inbound connections to match the configured hostname,
+        # so we can't configure 0.0.0.0
+        server1_hostname = services_hostname = "127.0.0.1"
+
+        (
+            server1_management_hostname,
+            server1_management_port,
+        ) = self.get_hostname_and_port()
+        (
+            services_management_hostname,
+            services_management_port,
+        ) = self.get_hostname_and_port()
+
+        self.template_vars = dict(
+            certs_dir=certs_dir(),
+            c2s_hostname=c2s_hostname,
+            c2s_port=c2s_port,
+            server1_hostname=server1_hostname,
+            server1_port=server1_port,
+            server1_cert_sha1=(certs_dir() / "My.Little.Server.pem.sha1")
+            .read_text()
+            .strip(),
+            server1_management_hostname=server1_management_hostname,
+            server1_management_port=server1_management_port,
+            services_hostname=services_hostname,
+            services_port=services_port,
+            services_cert_sha1=(certs_dir() / "My.Little.Services.pem.sha1")
+            .read_text()
+            .strip(),
+            services_management_hostname=services_management_hostname,
+            services_management_port=services_management_port,
+        )
+
+        with self.open_file("configs/network.conf") as fd:
+            fd.write(NETWORK_CONFIG % self.template_vars)
+        with self.open_file("configs/network_config.conf") as fd:
+            fd.write(NETWORK_CONFIG_CONFIG % self.template_vars)
+        with self.open_file("configs/server1.conf") as fd:
+            fd.write(SERVER_CONFIG % self.template_vars)
+
+        if faketime and shutil.which("faketime"):
+            faketime_cmd = ["faketime", "-f", faketime]
+            self.faketime_enabled = True
+        else:
+            faketime_cmd = []
+
+        self.proc = subprocess.Popen(
+            [
+                *faketime_cmd,
+                "sable_ircd",
+                "--foreground",
+                "--server-conf",
+                self.directory / "configs/server1.conf",
+                "--network-conf",
+                self.directory / "configs/network.conf",
+                "--bootstrap-network",
+                self.directory / "configs/network_config.conf",
+            ],
+            cwd=self.directory,
+            preexec_fn=os.setsid,
+        )
+        self.pgroup_id = os.getpgid(self.proc.pid)
+
+        if run_services:
+            self.services_controller = SableServicesController(self.test_config, self)
+            self.services_controller.run(
+                protocol="sable",
+                server_hostname=services_hostname,
+                server_port=services_port,
+            )
+
+    def kill_proc(self) -> None:
+        os.killpg(self.pgroup_id, signal.SIGKILL)
+        super().kill_proc()
+
+    def registerUser(
+        self,
+        case: BaseServerTestCase,  # type: ignore
+        username: str,
+        password: Optional[str] = None,
+    ) -> None:
+        # XXX: Move this somewhere else when
+        # https://github.com/ircv3/ircv3-specifications/pull/152 becomes
+        # part of the specification
+        if not case.run_services:
+            raise ValueError(
+                "Attempted to register a nick, but `run_services` it not True."
+            )
+        assert password
+        client = case.addClient(show_io=True)
+        case.sendLine(client, "NICK " + username)
+        case.sendLine(client, "USER r e g :user")
+        while case.getRegistrationMessage(client).command != "001":
+            pass
+        case.getMessages(client)
+        case.sendLine(
+            client,
+            f"REGISTER * * {password}",
+        )
+        for _ in range(100):
+            time.sleep(0.1)
+            try:
+                msg = case.getMessage(client)
+            except NoMessageException:
+                continue
+            case.assertMessageMatch(
+                msg, command="REGISTER", params=["SUCCESS", username, ANYSTR]
+            )
+            break
+        else:
+            raise NoMessageException()
+        case.sendLine(client, "QUIT")
+        case.assertDisconnected(client)
+
+
+class SableServicesController(BaseServicesController):
+    server_controller: SableController
+    software_name = "Sable Services"
+
+    def run(self, protocol: str, server_hostname: str, server_port: int) -> None:
+        assert protocol == "sable"
+        assert self.server_controller.directory is not None
+
+        with self.server_controller.open_file("configs/services.conf") as fd:
+            fd.write(SERVICES_CONFIG % self.server_controller.template_vars)
+
+        self.proc = subprocess.Popen(
+            [
+                "sable_services",
+                "--foreground",
+                "--server-conf",
+                self.server_controller.directory / "configs/services.conf",
+                "--network-conf",
+                self.server_controller.directory / "configs/network.conf",
+            ],
+            cwd=self.server_controller.directory,
+            preexec_fn=os.setsid,
+        )
+        self.pgroup_id = os.getpgid(self.proc.pid)
+
+    def kill_proc(self) -> None:
+        os.killpg(self.pgroup_id, signal.SIGKILL)
+        super().kill_proc()
+
+
+def get_irctest_controller_class() -> Type[SableController]:
+    return SableController

irctest/irc_utils/filelock.py

@@ -0,0 +1,19 @@
+"""
+Compatibility layer for filelock ( https://pypi.org/project/filelock/ );
+commonly packaged by Linux distributions but might not be available
+in some environments.
+"""
+
+import os
+from typing import ContextManager
+
+if os.getenv("PYTEST_XDIST_WORKER"):
+    # running under pytest-xdist; filelock is required for reliability
+    from filelock import FileLock
+else:
+    # normal test execution, no port races
+    import contextlib
+    from typing import Any
+
+    def FileLock(*args: Any, **kwargs: Any) -> ContextManager[None]:
+        return contextlib.nullcontext()

irctest/irc_utils/junkdrawer.py

@@ -13,7 +13,7 @@ def ircv3_timestamp_to_unixtime(timestamp: str) -> float:
 
 
 def random_name(base: str) -> str:
-    return base + "-" + secrets.token_hex(8)
+    return base + "-" + secrets.token_hex(5)
 
 
 def find_hostname_and_port() -> Tuple[str, int]:

irctest/numerics.py

@@ -204,5 +204,11 @@ ERR_ACCOUNT_INVALID_VERIFY_CODE = "925"
 RPL_REG_VERIFICATION_REQUIRED = "927"
 ERR_REG_INVALID_CRED_TYPE = "928"
 ERR_REG_INVALID_CALLBACK = "929"
+RPL_ENDOFPROPLIST = "960"
+RPL_PROPLIST = "961"
+RPL_ENDOFLISTPROPLIST = "962"
+RPL_LISTPROPLIST = "963"
+RPL_CHMODELIST = "964"
+RPL_UMODELIST = "965"
 ERR_TOOMANYLANGUAGES = "981"
 ERR_NOLANGUAGE = "982"

irctest/server_tests/away.py

@@ -11,13 +11,14 @@ from irctest.numerics import (
     RPL_USERHOST,
     RPL_WHOISUSER,
 )
-from irctest.patma import StrRe
+from irctest.patma import ANYSTR, StrRe
 
 
 class AwayTestCase(cases.BaseServerTestCase):
     @cases.mark_specifications("RFC2812", "Modern")
     def testAway(self):
         self.connectClient("bar")
+        self.getMessages(1)
         self.sendLine(1, "AWAY :I'm not here right now")
         replies = self.getMessages(1)
         self.assertIn(RPL_NOWAWAY, [msg.command for msg in replies])
@@ -29,6 +30,7 @@ class AwayTestCase(cases.BaseServerTestCase):
             command=RPL_AWAY,
             params=["qux", "bar", "I'm not here right now"],
         )
+        self.getMessages(1)
 
         self.sendLine(1, "AWAY")
         replies = self.getMessages(1)
@@ -47,12 +49,16 @@ class AwayTestCase(cases.BaseServerTestCase):
         """
         self.connectClient("bar")
         self.sendLine(1, "AWAY :I'm not here right now")
-        replies = self.getMessages(1)
+        self.assertMessageMatch(
-        self.assertIn(RPL_NOWAWAY, [msg.command for msg in replies])
+            self.getMessage(1), command=RPL_NOWAWAY, params=["bar", ANYSTR]
+        )
+        self.assertEqual(self.getMessages(1), [])
 
         self.sendLine(1, "AWAY")
-        replies = self.getMessages(1)
+        self.assertMessageMatch(
-        self.assertIn(RPL_UNAWAY, [msg.command for msg in replies])
+            self.getMessage(1), command=RPL_UNAWAY, params=["bar", ANYSTR]
+        )
+        self.assertEqual(self.getMessages(1), [])
 
     @cases.mark_specifications("Modern")
     def testAwayPrivmsg(self):

irctest/server_tests/away_notify.py

@@ -3,6 +3,8 @@
 """
 
 from irctest import cases
+from irctest.numerics import RPL_NOWAWAY, RPL_UNAWAY
+from irctest.patma import ANYSTR, StrRe
 
 
 class AwayNotifyTestCase(cases.BaseServerTestCase):
@@ -20,13 +22,28 @@ class AwayNotifyTestCase(cases.BaseServerTestCase):
         self.getMessages(1)
 
         self.sendLine(2, "AWAY :i'm going away")
-        self.getMessages(2)
+        self.assertMessageMatch(
+            self.getMessage(2), command=RPL_NOWAWAY, params=["bar", ANYSTR]
+        )
+        self.assertEqual(self.getMessages(2), [])
 
         awayNotify = self.getMessage(1)
-        self.assertMessageMatch(awayNotify, command="AWAY", params=["i'm going away"])
+        self.assertMessageMatch(
-        self.assertTrue(
+            awayNotify,
-            awayNotify.prefix.startswith("bar!"),
+            prefix=StrRe("bar!.*"),
-            "Unexpected away-notify source: %s" % (awayNotify.prefix,),
+            command="AWAY",
+            params=["i'm going away"],
+        )
+
+        self.sendLine(2, "AWAY")
+        self.assertMessageMatch(
+            self.getMessage(2), command=RPL_UNAWAY, params=["bar", ANYSTR]
+        )
+        self.assertEqual(self.getMessages(2), [])
+
+        awayNotify = self.getMessage(1)
+        self.assertMessageMatch(
+            awayNotify, prefix=StrRe("bar!.*"), command="AWAY", params=[]
         )
 
     @cases.mark_capabilities("away-notify")
@@ -45,7 +62,11 @@ class AwayNotifyTestCase(cases.BaseServerTestCase):
         self.getMessages(2)
 
         self.joinChannel(2, "#chan")
-        self.getMessages(2)
+        self.assertNotIn(
+            "AWAY",
+            [m.command for m in self.getMessages(2)],
+            "joining user got their own away status when they joined",
+        )
 
         messages = [msg for msg in self.getMessages(1) if msg.command == "AWAY"]
         self.assertEqual(

irctest/server_tests/cap.py

@@ -56,6 +56,10 @@ class CapTestCase(cases.BaseServerTestCase):
         )
 
     @cases.mark_specifications("IRCv3")
+    @cases.xfailIfSoftware(
+        ["Sable"],
+        "does not support multi-prefix",
+    )
     def testReqOne(self):
         """Tests requesting a single capability"""
         self.addClient(1)
@@ -89,8 +93,8 @@ class CapTestCase(cases.BaseServerTestCase):
 
     @cases.mark_specifications("IRCv3")
     @cases.xfailIfSoftware(
-        ["ngIRCd"],
+        ["ngIRCd", "Sable"],
-        "ngIRCd does not support userhost-in-names",
+        "does not support userhost-in-names",
     )
     def testReqTwo(self):
         """Tests requesting two capabilities at once"""
@@ -131,8 +135,8 @@ class CapTestCase(cases.BaseServerTestCase):
 
     @cases.mark_specifications("IRCv3")
     @cases.xfailIfSoftware(
-        ["ngIRCd"],
+        ["ngIRCd", "Sable"],
-        "ngIRCd does not support userhost-in-names",
+        "does not support userhost-in-names",
     )
     def testReqOneThenOne(self):
         """Tests requesting two capabilities in different messages"""
@@ -183,8 +187,8 @@ class CapTestCase(cases.BaseServerTestCase):
 
     @cases.mark_specifications("IRCv3")
     @cases.xfailIfSoftware(
-        ["ngIRCd"],
+        ["ngIRCd", "Sable"],
-        "ngIRCd does not support userhost-in-names",
+        "does not support userhost-in-names",
     )
     def testReqPostRegistration(self):
         """Tests requesting more capabilities after CAP END"""
@@ -300,7 +304,8 @@ class CapTestCase(cases.BaseServerTestCase):
         """  # noqa
         self.addClient(1)
         self.sendLine(1, "CAP LS 302")
-        self.assertIn("multi-prefix", self.getCapLs(1))
+        if "multi-prefix" not in self.getCapLs(1):
+            raise CapabilityNotSupported("multi-prefix")
         self.sendLine(1, "CAP REQ :foo multi-prefix bar")
         m = self.getRegistrationMessage(1)
         self.assertMessageMatch(

irctest/server_tests/chathistory.py

@@ -46,7 +46,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
         result = []
         for msg in inner_msgs:
             if (
-                msg.command == "PRIVMSG"
+                msg.command in ("PRIVMSG", "TOPIC")
                 and batch_tag is not None
                 and msg.tags.get("batch") == batch_tag
             ):
@@ -220,6 +220,47 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
         self.validate_echo_messages(NUM_MESSAGES, echo_messages)
         self.validate_chathistory(subcommand, echo_messages, 1, chname)
 
+    @skip_ngircd
+    def testChathistoryNoEventPlayback(self):
+        """Tests that non-messages don't appear in the chat history when event-playback
+        is not enabled."""
+
+        self.connectClient(
+            "bar",
+            capabilities=[
+                "message-tags",
+                "server-time",
+                "echo-message",
+                "batch",
+                "labeled-response",
+                "sasl",
+                CHATHISTORY_CAP,
+            ],
+            skip_if_cap_nak=True,
+        )
+        chname = "#chan" + secrets.token_hex(12)
+        self.joinChannel(1, chname)
+        self.getMessages(1)
+        self.getMessages(1)
+
+        NUM_MESSAGES = 10
+        echo_messages = []
+        for i in range(NUM_MESSAGES):
+            self.sendLine(1, "TOPIC %s :this is topic %d" % (chname, i))
+            self.getMessages(1)
+            self.sendLine(1, "PRIVMSG %s :this is message %d" % (chname, i))
+            echo_messages.extend(
+                msg.to_history_message() for msg in self.getMessages(1)
+            )
+            time.sleep(0.002)
+
+        self.validate_echo_messages(NUM_MESSAGES, echo_messages)
+        self.sendLine(1, "CHATHISTORY LATEST %s * 100" % chname)
+        (batch_open, *messages, batch_close) = self.getMessages(1)
+        self.assertMessageMatch(batch_open, command="BATCH")
+        self.assertMessageMatch(batch_close, command="BATCH")
+        self.assertEqual([msg for msg in messages if msg.command != "PRIVMSG"], [])
+
     @pytest.mark.parametrize("subcommand", SUBCOMMANDS)
     @skip_ngircd
     def testChathistoryEventPlayback(self, subcommand):
@@ -244,21 +285,27 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
         NUM_MESSAGES = 10
         echo_messages = []
         for i in range(NUM_MESSAGES):
+            self.sendLine(1, "TOPIC %s :this is topic %d" % (chname, i))
+            echo_messages.extend(
+                msg.to_history_message() for msg in self.getMessages(1)
+            )
+            time.sleep(0.002)
+
             self.sendLine(1, "PRIVMSG %s :this is message %d" % (chname, i))
             echo_messages.extend(
                 msg.to_history_message() for msg in self.getMessages(1)
             )
             time.sleep(0.002)
 
-        self.validate_echo_messages(NUM_MESSAGES, echo_messages)
+        self.validate_echo_messages(NUM_MESSAGES * 2, echo_messages)
         self.validate_chathistory(subcommand, echo_messages, 1, chname)
 
     @pytest.mark.parametrize("subcommand", SUBCOMMANDS)
     @pytest.mark.private_chathistory
     @skip_ngircd
     def testChathistoryDMs(self, subcommand):
-        c1 = "foo" + secrets.token_hex(12)
+        c1 = random_name("foo")
-        c2 = "bar" + secrets.token_hex(12)
+        c2 = random_name("bar")
         self.controller.registerUser(self, c1, "sesame1")
         self.controller.registerUser(self, c2, "sesame2")
         self.connectClient(
@@ -313,7 +360,7 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
         self.validate_chathistory(subcommand, echo_messages, 1, c2)
         self.validate_chathistory(subcommand, echo_messages, 2, c1)
 
-        c3 = "baz" + secrets.token_hex(12)
+        c3 = random_name("baz")
         self.connectClient(
             c3,
             capabilities=[
@@ -583,8 +630,8 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
     @pytest.mark.arbitrary_client_tags
     @skip_ngircd
     def testChathistoryTagmsg(self):
-        c1 = "foo" + secrets.token_hex(12)
+        c1 = random_name("foo")
-        c2 = "bar" + secrets.token_hex(12)
+        c2 = random_name("bar")
         chname = "#chan" + secrets.token_hex(12)
         self.controller.registerUser(self, c1, "sesame1")
         self.controller.registerUser(self, c2, "sesame2")
@@ -683,8 +730,8 @@ class ChathistoryTestCase(cases.BaseServerTestCase):
     @skip_ngircd
     def testChathistoryDMClientOnlyTags(self):
         # regression test for Ergo #1411
-        c1 = "foo" + secrets.token_hex(12)
+        c1 = random_name("foo")
-        c2 = "bar" + secrets.token_hex(12)
+        c2 = random_name("bar")
         self.controller.registerUser(self, c1, "sesame1")
         self.controller.registerUser(self, c2, "sesame2")
         self.connectClient(

irctest/server_tests/chmodes/key.py

@@ -44,8 +44,8 @@ class KeyTestCase(cases.BaseServerTestCase):
 
     @pytest.mark.parametrize(
         "key",
-        ["passphrase with spaces", "long" * 100, ""],
+        ["passphrase with spaces", "long" * 100, "", " "],
-        ids=["spaces", "long", "empty"],
+        ids=["spaces", "long", "empty", "only-space"],
     )
     @cases.mark_specifications("RFC2812", "Modern")
     def testKeyValidation(self, key):
@@ -84,6 +84,8 @@ class KeyTestCase(cases.BaseServerTestCase):
                 "ngIRCd does not validate channel keys: "
                 "https://github.com/ngircd/ngircd/issues/290"
             )
+        if key == " " and self.controller.software_name == "irc2":
+            pytest.xfail("irc2 rewrites non-empty keys that contain only spaces")
 
         self.connectClient("bar")
         self.joinChannel(1, "#chan")

irctest/server_tests/chmodes/no_ctcp.py

@@ -0,0 +1,31 @@
+from irctest import cases
+from irctest.numerics import ERR_CANNOTSENDTOCHAN
+
+
+class NoCTCPChannelModeTestCase(cases.BaseServerTestCase):
+    @cases.mark_specifications("Ergo")
+    def testNoCTCPChannelMode(self):
+        """Test Ergo's +C channel mode that blocks CTCPs."""
+        self.connectClient("bar")
+        self.joinChannel(1, "#chan")
+        self.sendLine(1, "MODE #chan +C")
+        self.getMessages(1)
+
+        self.connectClient("qux")
+        self.joinChannel(2, "#chan")
+        self.getMessages(2)
+
+        self.sendLine(1, "PRIVMSG #chan :\x01ACTION hi\x01")
+        self.getMessages(1)
+        ms = self.getMessages(2)
+        self.assertEqual(len(ms), 1)
+        self.assertMessageMatch(
+            ms[0], command="PRIVMSG", params=["#chan", "\x01ACTION hi\x01"]
+        )
+
+        self.sendLine(1, "PRIVMSG #chan :\x01PING 1473523796 918320\x01")
+        ms = self.getMessages(1)
+        self.assertEqual(len(ms), 1)
+        self.assertMessageMatch(ms[0], command=ERR_CANNOTSENDTOCHAN)
+        ms = self.getMessages(2)
+        self.assertEqual(ms, [])

irctest/server_tests/connection_registration.py

@@ -5,6 +5,8 @@ Tests section 4.1 of RFC 1459.
 TODO: cross-reference Modern and RFC 2812 too
 """
 
+import time
+
 from irctest import cases
 from irctest.client_mock import ConnectionClosed
 from irctest.numerics import ERR_NEEDMOREPARAMS, ERR_PASSWDMISMATCH
@@ -133,7 +135,7 @@ class ConnectionRegistrationTestCase(cases.BaseServerTestCase):
         self.assertNotEqual(
             m.command,
             "001",
-            "Received 001 after registering with the nick of a " "registered user.",
+            "Received 001 after registering with the nick of a registered user.",
         )
 
     def testEarlyNickCollision(self):
@@ -206,3 +208,58 @@ class ConnectionRegistrationTestCase(cases.BaseServerTestCase):
             command=ERR_NEEDMOREPARAMS,
             params=[StrRe(r"(\*|foo)"), "USER", ANYSTR],
         )
+
+    def testNonutf8Realname(self):
+        self.addClient()
+        self.sendLine(1, "NICK foo")
+        line = b"USER username * * :i\xe8rc\xe9\r\n"
+        print("1 -> S (repr): " + repr(line))
+        self.clients[1].conn.sendall(line)
+        for _ in range(10):
+            time.sleep(1)
+            d = self.clients[1].conn.recv(10000)
+            self.assertTrue(d, "Server closed connection")
+            print("S -> 1 (repr): " + repr(d))
+            if b" 001 " in d:
+                break
+            if b"ERROR " in d or b" FAIL " in d:
+                # Rejected; nothing more to test.
+                return
+            for line in d.split(b"\r\n"):
+                if line.startswith(b"PING "):
+                    line = line.replace(b"PING", b"PONG") + b"\r\n"
+                    print("1 -> S (repr): " + repr(line))
+                    self.clients[1].conn.sendall(line)
+        else:
+            self.assertTrue(False, "stuck waiting")
+        self.sendLine(1, "WHOIS foo")
+        time.sleep(3)  # for ngIRCd
+        d = self.clients[1].conn.recv(10000)
+        print("S -> 1 (repr): " + repr(d))
+        self.assertIn(b"username", d)
+
+    def testNonutf8Username(self):
+        self.addClient()
+        self.sendLine(1, "NICK foo")
+        self.sendLine(1, "USER 😊😊😊😊😊😊😊😊😊😊 * * :realname")
+        for _ in range(10):
+            time.sleep(1)
+            d = self.clients[1].conn.recv(10000)
+            self.assertTrue(d, "Server closed connection")
+            print("S -> 1 (repr): " + repr(d))
+            if b" 001 " in d:
+                break
+            if b" 468" in d or b"ERROR " in d:
+                # Rejected; nothing more to test.
+                return
+            for line in d.split(b"\r\n"):
+                if line.startswith(b"PING "):
+                    line = line.replace(b"PING", b"PONG") + b"\r\n"
+                    print("1 -> S (repr): " + repr(line))
+                    self.clients[1].conn.sendall(line)
+        else:
+            self.assertTrue(False, "stuck waiting")
+        self.sendLine(1, "WHOIS foo")
+        d = self.clients[1].conn.recv(10000)
+        print("S -> 1 (repr): " + repr(d))
+        self.assertIn(b"realname", d)

irctest/server_tests/echo_message.py

@@ -32,6 +32,9 @@ class EchoMessageTestCase(cases.BaseServerTestCase):
 
         self.sendLine(1, "JOIN #chan")
 
+        # Synchronize
+        self.getMessages(1)
+
         if not solo:
             self.connectClient("qux", capabilities=capabilities)
             self.sendLine(2, "JOIN #chan")

irctest/server_tests/messages.py

@@ -13,6 +13,7 @@ class PrivmsgTestCase(cases.BaseServerTestCase):
         """<https://tools.ietf.org/html/rfc2812#section-3.3.1>"""
         self.connectClient("foo")
         self.sendLine(1, "JOIN #chan")
+        self.getMessages(1)  # synchronize
         self.connectClient("bar")
         self.sendLine(2, "JOIN #chan")
         self.getMessages(2)  # synchronize
@@ -53,6 +54,28 @@ class PrivmsgTestCase(cases.BaseServerTestCase):
         # ERR_NOSUCHNICK: 401 <sender> <recipient> :No such nick
         self.assertMessageMatch(msg, command="401", params=["foo", "bar", ANYSTR])
 
+    @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
+    @cases.xfailIfSoftware(
+        ["irc2"],
+        "replies with ERR_NEEDMOREPARAMS instead of ERR_NOTEXTTOSEND",
+    )
+    def testEmptyPrivmsg(self):
+        self.connectClient("foo")
+        self.sendLine(1, "JOIN #chan")
+        self.getMessages(1)  # synchronize
+        self.connectClient("bar")
+        self.sendLine(2, "JOIN #chan")
+        self.getMessages(2)  # synchronize
+        self.getMessages(1)  # synchronize
+        self.sendLine(1, "PRIVMSG #chan :")
+
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command="412",  # ERR_NOTEXTTOSEND
+            params=["foo", ANYSTR],
+        )
+        self.assertEqual(self.getMessages(2), [])
+
 
 class NoticeTestCase(cases.BaseServerTestCase):
     @cases.mark_specifications("RFC1459", "RFC2812")

irctest/server_tests/named_modes.py

@@ -0,0 +1,505 @@
+import re
+
+from irctest import cases
+from irctest.numerics import (
+    ERR_BANNEDFROMCHAN,
+    ERR_CANNOTSENDTOCHAN,
+    ERR_INVITEONLYCHAN,
+    RPL_CHMODELIST,
+    RPL_ENDOFLISTPROPLIST,
+    RPL_ENDOFPROPLIST,
+    RPL_LISTPROPLIST,
+    RPL_PROPLIST,
+    RPL_UMODELIST,
+)
+from irctest.patma import ANYLIST, ANYSTR, ListRemainder, StrRe
+from irctest.runner import NotImplementedByController
+
+CHMODES = {
+    "op",
+    "voice",
+    "ban",
+    "inviteonly",
+    "limit",
+    "moderated",
+    "noextmsg",
+    "key",
+    "private",
+    "topiclock",
+    "secret",
+    "banex",
+    "invex",
+    "admin",
+    "halfop",
+    "noctcp",
+    "owner",
+    "permanent",
+    "regonly",
+    "secureonly",
+    "mute",
+}
+
+UMODES = {
+    "invisible",
+    "oper",
+    "snomask",
+    "wallops",
+    "bot",
+    "hidechans",
+    "cloak",
+}
+
+
+class _NamedModeTestMixin:
+    ALLOW_MODE_REPLY: bool
+
+    def assertNewBans(self, msgs, expected_masks):
+        """Checks ``msgs`` is a set of PROP messages (and/or MODE if
+        ``self.ALLOW_MODE_REPLY`` is True) that ban exactly the given set of masks."""
+        banned_masks = set()
+        for msg in msgs:
+            if self.ALLOW_MODE_REPLY and msg.command == "MODE":
+                self.assertMessageMatch(
+                    msg, command="MODE", params=["#chan", StrRe(r"\+?b+"), *ANYLIST]
+                )
+                (_, chars, *args) = msg.params
+                chars = chars.lstrip("+")
+                self.assertEqual(
+                    len(chars), len(args), "Mismatched number of +b and args"
+                )
+                banned_masks.update(args)
+            else:
+                self.assertMessageMatch(
+                    msg,
+                    command="PROP",
+                    params=["#chan", ListRemainder(StrRe(r"\+ban=.+"), min_length=1)],
+                )
+                banned_masks.update(param.split("=")[1] for param in msg.params[1:])
+
+        self.assertEqual(banned_masks, expected_masks)
+
+    def assertNewUnbans(self, msgs, expected_masks):
+        """Same as ``assertNewBans`` but for unbans."""
+        banned_masks = set()
+        for msg in msgs:
+            if self.ALLOW_MODE_REPLY and msg.command == "MODE":
+                self.assertMessageMatch(
+                    msg, command="MODE", params=["#chan", StrRe(r"-b+"), *ANYLIST]
+                )
+                (_, chars, *args) = msg.params
+                chars = chars.lstrip("-")
+                self.assertEqual(
+                    len(chars), len(args), "Mismatched number of -b and args"
+                )
+                banned_masks.update(args)
+            else:
+                self.assertMessageMatch(
+                    msg,
+                    command="PROP",
+                    params=["#chan", ListRemainder(StrRe(r"-ban=.+"), min_length=1)],
+                )
+                banned_masks.update(param.split("=")[1] for param in msg.params[1:])
+
+        self.assertEqual(banned_masks, expected_masks)
+
+    @cases.mark_capabilities("draft/named-modes")
+    @cases.mark_specifications("IRCv3")
+    def testListMode(self):
+        """Checks list modes (type 1), using 'ban' as example."""
+        self.connectClient(
+            "foo", name="user", capabilities=["draft/named-modes"], skip_if_cap_nak=True
+        )
+        self.connectClient("chanop", name="chanop", capabilities=["draft/named-modes"])
+        self.joinChannel("chanop", "#chan")
+        self.getMessages("chanop")
+
+        # Set ban
+        self.sendLine("chanop", "PROP #chan +ban=foo!*@*")
+        self.assertNewBans(self.getMessages("chanop"), {"foo!*@*"})
+
+        # Should not appear in the main list
+        self.sendLine("chanop", "PROP #chan")
+        msg = self.getMessage("chanop")
+        self.assertMessageMatch(
+            msg, command=RPL_PROPLIST, params=["chanop", "#chan", *ANYLIST]
+        )
+        self.assertNotIn("ban", msg.params[2:])
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_ENDOFPROPLIST,
+            params=["chanop", "#chan", ANYSTR],
+        )
+
+        # Check banned
+        self.sendLine("chanop", "PROP #chan ban")
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_LISTPROPLIST,
+            params=["chanop", "#chan", "ban", "foo!*@*", *ANYLIST],
+        )
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_ENDOFLISTPROPLIST,
+            params=["chanop", "#chan", "ban", ANYSTR],
+        )
+        self.sendLine("user", "JOIN #chan")
+        self.assertMessageMatch(self.getMessage("user"), command=ERR_BANNEDFROMCHAN)
+
+        # Unset ban
+        self.sendLine("chanop", "PROP #chan -ban=foo!*@*")
+        self.assertNewUnbans(self.getMessages("chanop"), {"foo!*@*"})
+
+        # Check unbanned
+        self.sendLine("chanop", "PROP #chan ban")
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_ENDOFLISTPROPLIST,
+            params=["chanop", "#chan", "ban", ANYSTR],
+        )
+        self.sendLine("user", "JOIN #chan")
+        self.assertMessageMatch(
+            self.getMessage("user"), command="JOIN", params=["#chan"]
+        )
+
+    @cases.mark_capabilities("draft/named-modes")
+    @cases.mark_specifications("IRCv3")
+    def testFlagModeDefaultOn(self):
+        """Checks flag modes (type 4), using 'noextmsg' as example."""
+        self.connectClient(
+            "foo", name="user", capabilities=["draft/named-modes"], skip_if_cap_nak=True
+        )
+        self.connectClient("chanop", name="chanop", capabilities=["draft/named-modes"])
+        self.joinChannel("chanop", "#chan")
+        self.getMessages("chanop")
+
+        # Check set
+        self.sendLine("chanop", "PROP #chan")
+        msg = self.getMessage("chanop")
+        self.assertMessageMatch(
+            msg, command=RPL_PROPLIST, params=["chanop", "#chan", *ANYLIST]
+        )
+        self.assertIn("noextmsg", msg.params[2:])
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_ENDOFPROPLIST,
+            params=["chanop", "#chan", ANYSTR],
+        )
+        self.sendLine("user", "PRIVMSG #chan :hi")
+        self.assertMessageMatch(
+            self.getMessage("user"),
+            command=ERR_CANNOTSENDTOCHAN,
+            params=["foo", "#chan", ANYSTR],
+        )
+        self.assertEqual(self.getMessages("chanop"), [])
+
+        # Unset
+        self.sendLine("chanop", "PROP #chan -noextmsg")
+        msg = self.getMessage("chanop")
+        if self.ALLOW_MODE_REPLY and msg.command == "MODE":
+            self.assertMessageMatch(msg, command="MODE", params=["#chan", "-noextmsg"])
+        else:
+            self.assertMessageMatch(msg, command="PROP", params=["#chan", "-noextmsg"])
+
+        # Check unset
+        self.sendLine("chanop", "PROP #chan")
+        msg = self.getMessage("chanop")
+        self.assertMessageMatch(
+            msg, command=RPL_PROPLIST, params=["chanop", "#chan", *ANYLIST]
+        )
+        self.assertNotIn("noextmsg", msg.params[2:])
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_ENDOFPROPLIST,
+            params=["chanop", "#chan", ANYSTR],
+        )
+        self.sendLine("user", "PRIVMSG #chan :hi")
+        self.assertEqual(self.getMessages("user"), [])
+        self.assertMessageMatch(
+            self.getMessage("chanop"), command="PRIVMSG", params=["#chan", "hi"]
+        )
+
+        # Set
+        self.sendLine("chanop", "PROP #chan +noextmsg")
+        msg = self.getMessage("chanop")
+        if self.ALLOW_MODE_REPLY and msg.command == "MODE":
+            self.assertMessageMatch(msg, command="MODE", params=["#chan", "+noextmsg"])
+        else:
+            self.assertMessageMatch(msg, command="PROP", params=["#chan", "+noextmsg"])
+
+        # Check set again
+        self.sendLine("chanop", "PROP #chan")
+        msg = self.getMessage("chanop")
+        self.assertMessageMatch(
+            msg, command=RPL_PROPLIST, params=["chanop", "#chan", *ANYLIST]
+        )
+        self.assertIn("noextmsg", msg.params[2:])
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_ENDOFPROPLIST,
+            params=["chanop", "#chan", ANYSTR],
+        )
+        self.sendLine("user", "PRIVMSG #chan :hi")
+        self.assertMessageMatch(
+            self.getMessage("user"),
+            command=ERR_CANNOTSENDTOCHAN,
+            params=["foo", "#chan", ANYSTR],
+        )
+        self.assertEqual(self.getMessages("chanop"), [])
+
+    @cases.mark_capabilities("draft/named-modes")
+    @cases.mark_specifications("IRCv3")
+    def testFlagModeDefaultOff(self):
+        """Checks flag modes (type 4), using 'inviteonly' as example."""
+        self.connectClient(
+            "foo", name="user", capabilities=["draft/named-modes"], skip_if_cap_nak=True
+        )
+        self.connectClient("chanop", name="chanop", capabilities=["draft/named-modes"])
+        self.joinChannel("chanop", "#chan")
+        self.getMessages("chanop")
+
+        # Check unset
+        self.sendLine("chanop", "PROP #chan")
+        msg = self.getMessage("chanop")
+        self.assertMessageMatch(
+            msg, command=RPL_PROPLIST, params=["chanop", "#chan", *ANYLIST]
+        )
+        self.assertNotIn("inviteonly", msg.params[2:])
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_ENDOFPROPLIST,
+            params=["chanop", "#chan", ANYSTR],
+        )
+        self.sendLine("user", "JOIn #chan")
+        self.assertMessageMatch(
+            self.getMessage("user"), command="JOIN", params=["#chan"]
+        )
+        self.sendLine("user", "PART #chan :bye")
+        self.getMessages("user")
+        self.getMessages("chanop")
+
+        # Set
+        self.sendLine("chanop", "PROP #chan +inviteonly")
+        msg = self.getMessage("chanop")
+        if self.ALLOW_MODE_REPLY and msg.command == "MODE":
+            self.assertMessageMatch(
+                msg, command="MODE", params=["#chan", "+inviteonly"]
+            )
+        else:
+            self.assertMessageMatch(
+                msg, command="PROP", params=["#chan", "+inviteonly"]
+            )
+
+        # Check set
+        self.sendLine("chanop", "PROP #chan")
+        msg = self.getMessage("chanop")
+        self.assertMessageMatch(
+            msg, command=RPL_PROPLIST, params=["chanop", "#chan", *ANYLIST]
+        )
+        self.assertIn("inviteonly", msg.params[2:])
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_ENDOFPROPLIST,
+            params=["chanop", "#chan", ANYSTR],
+        )
+        self.sendLine("user", "JOIN #chan")
+        self.assertMessageMatch(self.getMessage("user"), command=ERR_INVITEONLYCHAN)
+
+        # Unset
+        self.sendLine("chanop", "PROP #chan -inviteonly")
+        msg = self.getMessage("chanop")
+        if self.ALLOW_MODE_REPLY and msg.command == "MODE":
+            self.assertMessageMatch(
+                msg, command="MODE", params=["#chan", "-inviteonly"]
+            )
+        else:
+            self.assertMessageMatch(
+                msg, command="PROP", params=["#chan", "-inviteonly"]
+            )
+
+        # Check unset again
+        self.sendLine("chanop", "PROP #chan")
+        msg = self.getMessage("chanop")
+        self.assertMessageMatch(
+            msg, command=RPL_PROPLIST, params=["chanop", "#chan", *ANYLIST]
+        )
+        self.assertNotIn("inviteonly", msg.params[2:])
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_ENDOFPROPLIST,
+            params=["chanop", "#chan", ANYSTR],
+        )
+        self.sendLine("user", "JOIn #chan")
+        self.assertMessageMatch(
+            self.getMessage("user"), command="JOIN", params=["#chan"]
+        )
+
+    @cases.mark_capabilities("draft/named-modes")
+    @cases.mark_specifications("IRCv3")
+    def testManyListModes(self):
+        """Checks setting three list modes (type 1) at once, using 'ban' as example."""
+        self.connectClient("chanop", name="chanop", capabilities=["draft/named-modes"])
+        self.joinChannel("chanop", "#chan")
+        self.getMessages("chanop")
+
+        if int(self.server_support.get("MAXMODES") or "1") < 3:
+            raise NotImplementedByController("MAXMODES is not >= 3.")
+
+        # Set ban
+        self.sendLine("chanop", "PROP #chan +ban=foo1!*@* +ban=foo2!*@* +ban=foo3!*@*")
+        msgs = self.getMessages("chanop")
+        self.assertNewBans(msgs, {"foo1!*@*", "foo2!*@*", "foo3!*@*"})
+
+        # Should not appear in the main list
+        self.sendLine("chanop", "PROP #chan")
+        msg = self.getMessage("chanop")
+        self.assertMessageMatch(
+            msg, command=RPL_PROPLIST, params=["chanop", "#chan", *ANYLIST]
+        )
+        self.assertNotIn("ban", msg.params[2:])
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_ENDOFPROPLIST,
+            params=["chanop", "#chan", ANYSTR],
+        )
+
+        # Check banned
+        self.sendLine("chanop", "PROP #chan ban")
+        # TODO: make it so the order doesn't matter
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_LISTPROPLIST,
+            params=["chanop", "#chan", "ban", "foo1!*@*", *ANYLIST],
+        )
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_LISTPROPLIST,
+            params=["chanop", "#chan", "ban", "foo2!*@*", *ANYLIST],
+        )
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_LISTPROPLIST,
+            params=["chanop", "#chan", "ban", "foo3!*@*", *ANYLIST],
+        )
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_ENDOFLISTPROPLIST,
+            params=["chanop", "#chan", "ban", ANYSTR],
+        )
+
+        # Unset two bans
+        self.sendLine("chanop", "PROP #chan -ban=foo2!*@* -ban=foo3!*@*")
+        msgs = self.getMessages("chanop")
+        self.assertNewUnbans(msgs, {"foo2!*@*", "foo3!*@*"})
+
+        # Check unbanned
+        self.sendLine("chanop", "PROP #chan ban")
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_LISTPROPLIST,
+            params=["chanop", "#chan", "ban", "foo1!*@*", *ANYLIST],
+        )
+        self.assertMessageMatch(
+            self.getMessage("chanop"),
+            command=RPL_ENDOFLISTPROPLIST,
+            params=["chanop", "#chan", "ban", ANYSTR],
+        )
+
+
+class NamedModesTestCase(_NamedModeTestMixin, cases.BaseServerTestCase):
+    """Normal testing of the named-modes spec."""
+
+    ALLOW_MODE_REPLY = True
+
+    @cases.mark_capabilities("draft/named-modes")
+    @cases.mark_specifications("IRCv3")
+    def testConnectionNumerics(self):
+        """Tests RPL_CHMODELIST and RPL_UMODELIST."""
+        self.connectClient(
+            "capchk",
+            name="capchk",
+            capabilities=["draft/named-modes"],
+            skip_if_cap_nak=True,
+        )
+
+        self.addClient(1)
+        self.sendLine(1, "CAP LS 302")
+        self.getCapLs(1)
+        self.sendLine(1, "USER user user user :user")
+        self.sendLine(1, "NICK user")
+        self.sendLine(1, "CAP END")
+        self.skipToWelcome(1)
+        msgs = self.getMessages(1)
+
+        seen_chmodes = set()
+        seen_umodes = set()
+
+        got_last_chmode = False
+        got_last_umode = False
+        capturing_re = r"[12345]:(?P<name>(\S+/)?[a-zA-Z0-9-]+)(=[a-zA-Z]+)?"
+        # fmt: off
+        chmode_re = r"^[12345]:(\S+/)?[a-zA-Z0-9-]+(=[a-zA-Z]+)?$"
+        umode_re  =    r"^[34]:(\S+/)?[a-zA-Z0-9-]+(=[a-zA-Z]+)?$"  # noqa
+        # fmt: on
+        chmode_pat = [ListRemainder(StrRe(chmode_re), min_length=1)]
+        umode_pat = [ListRemainder(StrRe(umode_re), min_length=1)]
+        for msg in msgs:
+            if msg.command == RPL_CHMODELIST:
+                self.assertFalse(
+                    got_last_chmode, "Got RPL_CHMODELIST after the list ended."
+                )
+                if msg.params[1] == "*":
+                    self.assertMessageMatch(
+                        msg, command=RPL_CHMODELIST, params=["user", "*", *chmode_pat]
+                    )
+                else:
+                    self.assertMessageMatch(
+                        msg, command=RPL_CHMODELIST, params=["user", *chmode_pat]
+                    )
+                    got_last_chmode = True
+
+                for token in msg.params[-1].split(" "):
+                    name = re.match(capturing_re, token).group("name")
+                    self.assertNotIn(name, seen_chmodes, f"Duplicate chmode {name}")
+                    seen_chmodes.add(name)
+
+            elif msg.command == RPL_UMODELIST:
+                self.assertFalse(
+                    got_last_umode, "Got RPL_UMODELIST after the list ended."
+                )
+                if msg.params[1] == "*":
+                    self.assertMessageMatch(
+                        msg, command=RPL_UMODELIST, params=["user", "*", *umode_pat]
+                    )
+                else:
+                    self.assertMessageMatch(
+                        msg, command=RPL_UMODELIST, params=["user", *umode_pat]
+                    )
+                    got_last_umode = True
+
+                for token in msg.params[-1].split(" "):
+                    name = re.match(capturing_re, token).group("name")
+                    self.assertNotIn(name, seen_umodes, f"Duplicate umode {name}")
+                    seen_umodes.add(name)
+
+        self.assertIn(
+            "noextmsg", seen_chmodes, "'noextmsg' chmode not supported/advertised"
+        )
+        self.assertIn(
+            "invisible", seen_umodes, "'invisible' umode not supported/advertised"
+        )
+
+        unknown_chmodes = {m for m in seen_chmodes if "/" not in m} - CHMODES
+        unknown_umodes = {m for m in seen_umodes if "/" not in m} - UMODES
+        self.assertFalse(
+            unknown_chmodes, fail_msg="Got unknown unvendored chmodes: {got}"
+        )
+        self.assertFalse(
+            unknown_umodes, fail_msg="Got unknown unvendored umodes: {got}"
+        )
+
+
+class OverlyStrictNamedModesTestCase(_NamedModeTestMixin, cases.BaseServerTestCase):
+    """Stronger tests, that assert the server only sends PROP and never MODE.
+    Passing these tests is not required to"""
+
+    ALLOW_MODE_REPLY = False

irctest/server_tests/quit.py

@@ -10,7 +10,6 @@ TODO: cross-reference RFC 1459 and Modern
 import time
 
 from irctest import cases
-from irctest.numerics import ERR_CANNOTSENDTOCHAN
 from irctest.patma import StrRe
 
 
@@ -40,31 +39,3 @@ class ChannelQuitTestCase(cases.BaseServerTestCase):
         m = self.getMessage(1)
         self.assertMessageMatch(m, command="QUIT", params=[StrRe(".*qux out.*")])
         self.assertTrue(m.prefix.startswith("qux"))  # nickmask of quitter
-
-
-class NoCTCPTestCase(cases.BaseServerTestCase):
-    @cases.mark_specifications("Ergo")
-    def testQuit(self):
-        self.connectClient("bar")
-        self.joinChannel(1, "#chan")
-        self.sendLine(1, "MODE #chan +C")
-        self.getMessages(1)
-
-        self.connectClient("qux")
-        self.joinChannel(2, "#chan")
-        self.getMessages(2)
-
-        self.sendLine(1, "PRIVMSG #chan :\x01ACTION hi\x01")
-        self.getMessages(1)
-        ms = self.getMessages(2)
-        self.assertEqual(len(ms), 1)
-        self.assertMessageMatch(
-            ms[0], command="PRIVMSG", params=["#chan", "\x01ACTION hi\x01"]
-        )
-
-        self.sendLine(1, "PRIVMSG #chan :\x01PING 1473523796 918320\x01")
-        ms = self.getMessages(1)
-        self.assertEqual(len(ms), 1)
-        self.assertMessageMatch(ms[0], command=ERR_CANNOTSENDTOCHAN)
-        ms = self.getMessages(2)
-        self.assertEqual(ms, [])

irctest/server_tests/topic.py

@@ -11,13 +11,29 @@ from irctest.numerics import ERR_CHANOPRIVSNEEDED, RPL_NOTOPIC, RPL_TOPIC, RPL_T
 
 class TopicTestCase(cases.BaseServerTestCase):
     @cases.mark_specifications("RFC1459", "RFC2812")
-    def testTopic(self):
+    def testTopicRfc(self):
         """“Once a user has joined a channel, he receives information about
         all commands his server receives affecting the channel.  This
         includes […] TOPIC”
         -- <https://tools.ietf.org/html/rfc1459#section-4.2.1>
         and <https://tools.ietf.org/html/rfc2812#section-3.2.1>
         """
+        self._testTopic(assert_echo=False)
+
+    @cases.mark_specifications("Modern")
+    def testTopicModern(self):
+        """ "If the topic of a channel is changed or cleared, every client in that
+        channel (including the author of the topic change) will receive a TOPIC command
+        with the new topic as argument (or an empty argument if the topic was cleared)
+        alerting them to how the topic has changed.
+
+        Clients joining the channel in the future will receive a RPL_TOPIC numeric (or
+        lack thereof) accordingly."
+        -- https://modern.ircdocs.horse/#topic-message
+        """
+        self._testTopic(assert_echo=True)
+
+    def _testTopic(self, assert_echo: bool):
         self.connectClient("foo")
         self.joinChannel(1, "#chan")
 
@@ -41,6 +57,7 @@ class TopicTestCase(cases.BaseServerTestCase):
                 )
             self.assertMessageMatch(m, command="TOPIC")
         except client_mock.NoMessageException:
+            self.assertFalse(assert_echo, "TOPIC was not echoed back to the author")
             # The RFCs do not say TOPIC must be echoed
             pass
         m = self.getMessage(2)

irctest/server_tests/utf8.py

@@ -46,3 +46,38 @@ class Utf8TestCase(cases.BaseServerTestCase):
 
         if m.command in ("FAIL", "WARN"):
             self.assertMessageMatch(m, params=["PRIVMSG", "INVALID_UTF8", ANYSTR])
+
+    def testNonutf8Realname(self):
+        self.connectClient("foo")
+        if "UTF8ONLY" not in self.server_support:
+            raise runner.IsupportTokenNotSupported("UTF8ONLY")
+
+        self.addClient()
+        self.sendLine(2, "NICK foo")
+        self.clients[2].conn.sendall(b"USER username * * :i\xe8rc\xe9\r\n")
+
+        d = self.clients[2].conn.recv(1024)
+        if b" FAIL " in d or b" 468 " in d:  # ERR_INVALIDUSERNAME
+            return  # nothing more to test
+        self.assertIn(b" 001 ", d)
+
+        self.sendLine(2, "WHOIS foo")
+        self.getMessages(2)
+
+    def testNonutf8Username(self):
+        self.connectClient("foo")
+        if "UTF8ONLY" not in self.server_support:
+            raise runner.IsupportTokenNotSupported("UTF8ONLY")
+
+        self.addClient()
+        self.sendLine(2, "NICK foo")
+        self.sendLine(2, "USER 😊😊😊😊😊😊😊😊😊😊 * * :realname")
+        m = self.getRegistrationMessage(2)
+        if m.command in ("FAIL", "468"):  # ERR_INVALIDUSERNAME
+            return  # nothing more to test
+        self.assertMessageMatch(
+            m,
+            command="001",
+        )
+        self.sendLine(2, "WHOIS foo")
+        self.getMessages(2)

irctest/server_tests/who.py

@@ -87,7 +87,7 @@ class BaseWhoTestCase:
 class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase):
     @cases.mark_specifications("Modern")
     def testWhoStar(self):
-        if self.controller.software_name == "Bahamut":
+        if self.controller.software_name in ("Bahamut", "Sable"):
             raise runner.OptionalExtensionNotSupported("WHO mask")
 
         self._init()
@@ -118,7 +118,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase):
     )
     @cases.mark_specifications("Modern")
     def testWhoNick(self, mask):
-        if "*" in mask and self.controller.software_name == "Bahamut":
+        if "*" in mask and self.controller.software_name in ("Bahamut", "Sable"):
             raise runner.OptionalExtensionNotSupported("WHO mask")
 
         self._init()
@@ -148,7 +148,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase):
         ids=["username", "realname-mask", "hostname"],
     )
     def testWhoUsernameRealName(self, mask):
-        if "*" in mask and self.controller.software_name == "Bahamut":
+        if "*" in mask and self.controller.software_name in ("Bahamut", "Sable"):
             raise runner.OptionalExtensionNotSupported("WHO mask")
 
         self._init()
@@ -201,7 +201,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase):
     )
     @cases.mark_specifications("Modern")
     def testWhoNickAway(self, mask):
-        if "*" in mask and self.controller.software_name == "Bahamut":
+        if "*" in mask and self.controller.software_name in ("Bahamut", "Sable"):
             raise runner.OptionalExtensionNotSupported("WHO mask")
 
         self._init()
@@ -228,9 +228,14 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase):
     @pytest.mark.parametrize(
         "mask", ["coolNick", "coolnick", "coolni*"], ids=["exact", "casefolded", "mask"]
     )
+    @cases.xfailIfSoftware(
+        ["Sable"],
+        "Sable does not advertise oper status in WHO: "
+        "https://github.com/Libera-Chat/sable/pull/77",
+    )
     @cases.mark_specifications("Modern")
     def testWhoNickOper(self, mask):
-        if "*" in mask and self.controller.software_name == "Bahamut":
+        if "*" in mask and self.controller.software_name in ("Bahamut", "Sable"):
             raise runner.OptionalExtensionNotSupported("WHO mask")
 
         self._init()
@@ -262,9 +267,14 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase):
     @pytest.mark.parametrize(
         "mask", ["coolNick", "coolnick", "coolni*"], ids=["exact", "casefolded", "mask"]
     )
+    @cases.xfailIfSoftware(
+        ["Sable"],
+        "Sable does not advertise oper status in WHO: "
+        "https://github.com/Libera-Chat/sable/pull/77",
+    )
     @cases.mark_specifications("Modern")
     def testWhoNickAwayAndOper(self, mask):
-        if "*" in mask and self.controller.software_name == "Bahamut":
+        if "*" in mask and self.controller.software_name in ("Bahamut", "Sable"):
             raise runner.OptionalExtensionNotSupported("WHO mask")
 
         self._init()
@@ -298,18 +308,11 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase):
     @pytest.mark.parametrize("mask", ["#chan", "#CHAN"], ids=["exact", "casefolded"])
     @cases.mark_specifications("Modern")
     def testWhoChan(self, mask):
-        if "*" in mask and self.controller.software_name == "Bahamut":
+        if "*" in mask and self.controller.software_name in ("Bahamut", "Sable"):
             raise runner.OptionalExtensionNotSupported("WHO mask")
 
         self._init()
 
-        self.sendLine(1, "OPER operuser operpassword")
-        self.assertIn(
-            RPL_YOUREOPER,
-            [m.command for m in self.getMessages(1)],
-            fail_msg="OPER failed",
-        )
-
         self.sendLine(1, "AWAY :be right back")
         self.getMessages(1)
         self.getMessages(2)
@@ -335,7 +338,7 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase):
                 StrRe(host_re),
                 "My.Little.Server",
                 "coolNick",
-                "G*@",
+                "G@",
                 StrRe(realname_regexp(self.realname)),
             ],
         )
@@ -493,6 +496,46 @@ class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase):
             params=["otherNick", InsensitiveStr("coolNick"), ANYSTR],
         )
 
+    @pytest.mark.parametrize("char", "cuihsnfdlaor")
+    @cases.xfailIf(
+        lambda self, char: bool(
+            char == "l" and self.controller.software_name == "ircu2"
+        ),
+        "https://github.com/UndernetIRC/ircu2/commit/17c539103abbd0055b2297e17854cd0756c85d62",
+    )
+    @cases.xfailIf(
+        lambda self, char: bool(
+            char == "l" and self.controller.software_name == "Nefarious"
+        ),
+        "https://github.com/evilnet/nefarious2/pull/73",
+    )
+    def testWhoxOneChar(self, char):
+        self._init()
+        if "WHOX" not in self.server_support:
+            raise runner.IsupportTokenNotSupported("WHOX")
+
+        self.sendLine(2, f"WHO coolNick %{char}")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 2, "Unexpected number of messages")
+
+        (reply, end) = messages
+
+        self.assertMessageMatch(
+            reply,
+            command=RPL_WHOSPCRPL,
+            params=[
+                "otherNick",
+                StrRe(".+"),
+            ],
+        )
+
+        self.assertMessageMatch(
+            end,
+            command=RPL_ENDOFWHO,
+            params=["otherNick", InsensitiveStr("coolNick"), ANYSTR],
+        )
+
     def testWhoxToken(self):
         """https://github.com/ircv3/ircv3-specifications/pull/482"""
         self._init()
@@ -589,7 +632,7 @@ class WhoServicesTestCase(BaseWhoTestCase, cases.BaseServerTestCase):
 class WhoInvisibleTestCase(cases.BaseServerTestCase):
     @cases.mark_specifications("Modern")
     def testWhoInvisible(self):
-        if self.controller.software_name == "Bahamut":
+        if self.controller.software_name in ("Bahamut", "Sable"):
             raise runner.OptionalExtensionNotSupported("WHO mask")
 
         self.connectClient("evan", name="evan")

irctest/server_tests/whois.py

@@ -195,18 +195,26 @@ class WhoisTestCase(_WhoisTestMixin, cases.BaseServerTestCase):
 
         self.connectClient("otherNick")
         self.getMessages(2)
-        self.sendLine(2, f"WHOIS {server} coolnick")
+        self.sendLine(2, f"WHOIS {server} {nick}")
         messages = self.getMessages(2)
         whois_user = messages[0]
-        self.assertEqual(whois_user.command, RPL_WHOISUSER)
+        self.assertMessageMatch(
+            whois_user,
+            command=RPL_WHOISUSER,
             # "<client> <nick> <username> <host> * :<realname>"
-        self.assertEqual(whois_user.params[1], nick)
+            params=[
-        self.assertIn(whois_user.params[2], ("~" + username, username))
+                "otherNick",
+                nick,
+                StrRe("~?" + username),
+                ANYSTR,
+                ANYSTR,
+                realname,
+            ],
+        )
         # dumb regression test for oragono/oragono#355:
         self.assertNotIn(
             whois_user.params[3], [nick, username, "~" + username, realname]
         )
-        self.assertEqual(whois_user.params[5], realname)
 
     @pytest.mark.parametrize(
         "away,oper",

irctest/specifications.py

@@ -38,6 +38,7 @@ class Capabilities(enum.Enum):
     MESSAGE_TAGS = "message-tags"
     MULTILINE = "draft/multiline"
     MULTI_PREFIX = "multi-prefix"
+    NAMED_MODES = "draft/named-modes"
     SERVER_TIME = "server-time"
     SETNAME = "setname"
     STS = "sts"

make_workflows.py

@@ -151,6 +151,7 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
             env += (
                 f"PATH={software_config['prefix']}/sbin"
                 f":{software_config['prefix']}/bin"
+                f":{software_config['prefix']}"
                 f":$PATH "
             )
 

pytest.ini

@@ -29,6 +29,7 @@ markers =
     message-tags
     draft/multiline
     multi-prefix
+    draft/named-modes
     server-time
     setname
     sts

requirements.txt

@@ -1,3 +1,5 @@
+pytest
+
 # The following dependencies are actually optional:
 ecdsa
-pytest
+filelock

workflows.yml

@@ -162,6 +162,7 @@ software:
             # Insp3 <= 3.16.0 and Insp4 <= 4.0.0a21 don't support -DINSPIRCD_UNLIMITED_MAINLOOP
             patch src/inspircd.cpp < $GITHUB_WORKSPACE/patches/inspircd_mainloop.patch || true
 
+            wget https://raw.githubusercontent.com/progval/inspircd-contrib/namedmodes/4.0/m_ircv3_namedmodes.cpp -O src/modules/m_ircv3_namedmodes.cpp
             ./configure --prefix=$HOME/.local/inspircd --development
 
             CXXFLAGS=-DINSPIRCD_UNLIMITED_MAINLOOP make -j 4
@@ -235,7 +236,7 @@ software:
         name: ngircd
         repository: ngircd/ngircd
         refs:
-            stable: rel-26.1
+            stable: 0714466af88d71d6c395629cd7fb624b099507d4 # two years ahead of rel-26.1
             release: null
             devel: master
             devel_release: null
@@ -250,6 +251,34 @@ software:
             make -j 4
             make install
 
+    sable:
+        name: Sable
+        repository: Libera-Chat/sable
+        refs:
+            stable: ff1179512a79eba57ca468a5f83af84ecce08a5b
+            release: null
+            devel: master
+            devel_release: null
+        path: sable
+        prefix: "$GITHUB_WORKSPACE/sable/target/debug"
+        pre_deps:
+            - name: Install rust toolchain
+              uses: actions-rs/toolchain@v1
+              with:
+                  toolchain: nightly
+                  profile: minimal
+                  override: true
+            - name: Enable Cargo cache
+              uses: Swatinem/rust-cache@v2
+              with:
+                workspaces: "sable -> target"
+                cache-on-failure: true
+            - run: rustc --version
+        separate_build_job: false
+        build_script: |
+            cd $GITHUB_WORKSPACE/sable/
+            cargo build
+
     snircd:
         name: snircd
         repository: quakenet/snircd
@@ -337,8 +366,8 @@ software:
         separate_build_job: false
         path: Dlk-Services
         refs:
-            stable: &dlk_stable "6db51ea03f039c48fd20427c04cec8ff98df7878"
+            stable: null  # disabled because flaky, and hard to debug with all the PHP 8 warnings
-            release: *dlk_stable
+            release: &dlk_stable "6db51ea03f039c48fd20427c04cec8ff98df7878"
             devel: "main"
             devel_release: *dlk_stable
         build_script: |
@@ -454,6 +483,9 @@ tests:
     nefarious:
         software: [nefarious]
 
+    sable:
+        software: [sable]
+
     # doesn't build because it can't find liblex for some reason
     #snircd:
     #    software: [snircd]