Add test for mode +C ('no ctcp')

They make the first argument of numerics implicit, so there is actually
no difference with Modern

.github/workflows/test-devel.yml

@@ -66,7 +66,7 @@ jobs:
     - name: Build Bahamut
       run: |
         cd $GITHUB_WORKSPACE/Bahamut/
-        patch src/s_user.c < $GITHUB_WORKSPACE/bahamut_localhost.patch
+        patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch
         echo "#undef THROTTLE_ENABLE" >> include/config.h
         libtoolize --force
         aclocal
@@ -144,7 +144,7 @@ jobs:
     - name: Build InspIRCd
       run: |
         cd $GITHUB_WORKSPACE/inspircd/
-        patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch
+        patch src/inspircd.cpp < $GITHUB_WORKSPACE/patches/inspircd_mainloop.patch
         ./configure --prefix=$HOME/.local/inspircd --development
         make -j 4
         make install
@@ -184,6 +184,7 @@ jobs:
     - name: Build ngircd
       run: |
         cd $GITHUB_WORKSPACE/ngircd
+        patch src/ngircd/client.c < $GITHUB_WORKSPACE/patches/ngircd_whowas_delay.patch
         ./autogen.sh
         ./configure --prefix=$HOME/.local/
         make -j 4
@@ -297,13 +298,13 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.7
-    - name: Checkout UnrealIRCd
+    - name: Checkout UnrealIRCd 6
       uses: actions/checkout@v2
       with:
         path: unrealircd
-        ref: unreal52
+        ref: unreal60_dev
         repository: unrealircd/unrealircd
-    - name: Build UnrealIRCd
+    - name: Build UnrealIRCd 6
       run: |
         cd $GITHUB_WORKSPACE/unrealircd/
         cp $GITHUB_WORKSPACE/data/unreal/* .
@@ -322,6 +323,50 @@ jobs:
         name: installed-unrealircd
         path: ~/artefacts-*.tar.gz
         retention-days: 1
+  build-unrealircd-5:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Create directories
+      run: cd ~/; mkdir -p .local/ go/
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        key: 3-${{ runner.os }}-unrealircd-5-devel
+        path: '~/.cache
+
+          ${ github.workspace }/unrealircd
+
+          '
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+    - name: Checkout UnrealIRCd 5
+      uses: actions/checkout@v2
+      with:
+        path: unrealircd
+        ref: unreal52
+        repository: unrealircd/unrealircd
+    - name: Build UnrealIRCd 5
+      run: |
+        cd $GITHUB_WORKSPACE/unrealircd/
+        cp $GITHUB_WORKSPACE/data/unreal/* .
+        # Need to use a specific -march, because GitHub has inconsistent
+        # architectures across workers, which result in random SIGILL with some
+        # worker combinations
+        sudo apt install libsodium-dev libargon2-dev
+        CFLAGS="-O0 -march=x86-64" CXXFLAGS="$CFLAGS" ./Config -quick
+        make -j 4
+        make install
+    - name: Make artefact tarball
+      run: cd ~; tar -czf artefacts-unrealircd-5.tar.gz .local/ go/
+    - name: Upload build artefacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: installed-unrealircd-5
+        path: ~/artefacts-*.tar.gz
+        retention-days: 1
   publish-test-results:
     if: success() || failure()
     name: Publish Unit Tests Results
@@ -342,6 +387,7 @@ jobs:
     - test-solanum
     - test-sopel
     - test-unrealircd
+    - test-unrealircd-5
     - test-unrealircd-anope
     - test-unrealircd-atheme
     runs-on: ubuntu-latest
@@ -491,7 +537,7 @@ jobs:
         repository: ergochat/ergo
     - uses: actions/setup-go@v2
       with:
-        go-version: ~1.16
+        go-version: ^1.18.0
     - run: go version
     - name: Build Ergo
       run: |
@@ -516,6 +562,7 @@ jobs:
   test-hybrid:
     needs:
     - build-hybrid
+    - build-anope
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -528,6 +575,11 @@ jobs:
       with:
         name: installed-hybrid
         path: '~'
+    - name: Download build artefacts
+      uses: actions/download-artifact@v2
+      with:
+        name: installed-anope
+        path: '~'
     - name: Unpack artefacts
       run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
     - name: Install Atheme
@@ -537,7 +589,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  make
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH   make
         hybrid
     - if: always()
       name: Publish results
@@ -910,6 +962,38 @@ jobs:
       with:
         name: pytest results unrealircd (devel)
         path: pytest.xml
+  test-unrealircd-5:
+    needs:
+    - build-unrealircd-5
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+    - name: Download build artefacts
+      uses: actions/download-artifact@v2
+      with:
+        name: installed-unrealircd-5
+        path: '~'
+    - name: Unpack artefacts
+      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
+    - name: Install Atheme
+      run: sudo apt-get install atheme-services
+    - 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
+        make unrealircd-5
+    - if: always()
+      name: Publish results
+      uses: actions/upload-artifact@v2
+      with:
+        name: pytest results unrealircd-5 (devel)
+        path: pytest.xml
   test-unrealircd-anope:
     needs:
     - build-unrealircd

.github/workflows/test-devel_release.yml

@@ -57,7 +57,7 @@ jobs:
     - name: Build InspIRCd
       run: |
         cd $GITHUB_WORKSPACE/inspircd/
-        patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch
+        patch src/inspircd.cpp < $GITHUB_WORKSPACE/patches/inspircd_mainloop.patch
         ./configure --prefix=$HOME/.local/inspircd --development
         make -j 4
         make install

.github/workflows/test-stable.yml

@@ -61,12 +61,12 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: Bahamut
-        ref: v2.2.0
+        ref: v2.2.1
         repository: DALnet/Bahamut
     - name: Build Bahamut
       run: |
         cd $GITHUB_WORKSPACE/Bahamut/
-        patch src/s_user.c < $GITHUB_WORKSPACE/bahamut_localhost.patch
+        patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch
         echo "#undef THROTTLE_ENABLE" >> include/config.h
         libtoolize --force
         aclocal
@@ -149,7 +149,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: ircd-hybrid
-        ref: 8.2.38
+        ref: 8.2.39
         repository: ircd-hybrid/ircd-hybrid
     - name: Build Hybrid
       run: |
@@ -179,12 +179,12 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: inspircd
-        ref: v3.10.0
+        ref: v3.12.0
         repository: inspircd/inspircd
     - name: Build InspIRCd
       run: |
         cd $GITHUB_WORKSPACE/inspircd/
-        patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch
+        patch src/inspircd.cpp < $GITHUB_WORKSPACE/patches/inspircd_mainloop.patch
         ./configure --prefix=$HOME/.local/inspircd --development
         make -j 4
         make install
@@ -224,6 +224,7 @@ jobs:
     - name: Build ngircd
       run: |
         cd $GITHUB_WORKSPACE/ngircd
+        patch src/ngircd/client.c < $GITHUB_WORKSPACE/patches/ngircd_whowas_delay.patch
         ./autogen.sh
         ./configure --prefix=$HOME/.local/
         make -j 4
@@ -256,10 +257,10 @@ jobs:
       with:
         python-version: 3.7
     - name: clone
-      run: 'curl https://gitlab.com/rizon/plexus4/-/archive/403a967e3677a2a8420b504f451e7557259e0790/plexus4-403a967e3677a2a8420b504f451e7557259e0790.tar.gz
+      run: 'curl https://gitlab.com/rizon/plexus4/-/archive/20211115_0-611/plexus4-20211115_0-611.tar
-        | tar -zx
+        | tar -x
 
-        mv plexus4* plexus4'
+        mv plexus* plexus4'
     - name: build
       run: 'cd $GITHUB_WORKSPACE/plexus4
 
@@ -301,7 +302,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: solanum
-        ref: e370888264da666a1bd9faac86cd5f2aa06084f4
+        ref: 492d560ee13e71dc35403fd676e58c2d5bdcf2a9
         repository: solanum-ircd/solanum
     - name: Build Solanum
       run: |
@@ -337,13 +338,13 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.7
-    - name: Checkout UnrealIRCd
+    - name: Checkout UnrealIRCd 6
       uses: actions/checkout@v2
       with:
         path: unrealircd
-        ref: 94993a03ca8d3c193c0295c33af39270c3f9d27d
+        ref: daa0c11f285c7123ba9fa2966dee2d1a17729f1e
         repository: unrealircd/unrealircd
-    - name: Build UnrealIRCd
+    - name: Build UnrealIRCd 6
       run: |
         cd $GITHUB_WORKSPACE/unrealircd/
         cp $GITHUB_WORKSPACE/data/unreal/* .
@@ -362,6 +363,50 @@ jobs:
         name: installed-unrealircd
         path: ~/artefacts-*.tar.gz
         retention-days: 1
+  build-unrealircd-5:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Create directories
+      run: cd ~/; mkdir -p .local/ go/
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        key: 3-${{ runner.os }}-unrealircd-5-stable
+        path: '~/.cache
+
+          ${ github.workspace }/unrealircd
+
+          '
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+    - name: Checkout UnrealIRCd 5
+      uses: actions/checkout@v2
+      with:
+        path: unrealircd
+        ref: 6604856973f713a494f83d38992d7d61ce6b9db4
+        repository: unrealircd/unrealircd
+    - name: Build UnrealIRCd 5
+      run: |
+        cd $GITHUB_WORKSPACE/unrealircd/
+        cp $GITHUB_WORKSPACE/data/unreal/* .
+        # Need to use a specific -march, because GitHub has inconsistent
+        # architectures across workers, which result in random SIGILL with some
+        # worker combinations
+        sudo apt install libsodium-dev libargon2-dev
+        CFLAGS="-O0 -march=x86-64" CXXFLAGS="$CFLAGS" ./Config -quick
+        make -j 4
+        make install
+    - name: Make artefact tarball
+      run: cd ~; tar -czf artefacts-unrealircd-5.tar.gz .local/ go/
+    - name: Upload build artefacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: installed-unrealircd-5
+        path: ~/artefacts-*.tar.gz
+        retention-days: 1
   publish-test-results:
     if: success() || failure()
     name: Publish Unit Tests Results
@@ -385,6 +430,7 @@ jobs:
     - test-solanum
     - test-sopel
     - test-unrealircd
+    - test-unrealircd-5
     - test-unrealircd-anope
     - test-unrealircd-atheme
     runs-on: ubuntu-latest
@@ -566,7 +612,7 @@ jobs:
         repository: ergochat/ergo
     - uses: actions/setup-go@v2
       with:
-        go-version: ~1.16
+        go-version: ^1.18.0
     - run: go version
     - name: Build Ergo
       run: |
@@ -591,6 +637,7 @@ jobs:
   test-hybrid:
     needs:
     - build-hybrid
+    - build-anope
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -603,6 +650,11 @@ jobs:
       with:
         name: installed-hybrid
         path: '~'
+    - name: Download build artefacts
+      uses: actions/download-artifact@v2
+      with:
+        name: installed-anope
+        path: '~'
     - name: Unpack artefacts
       run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
     - name: Install Atheme
@@ -612,7 +664,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  make
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH   make
         hybrid
     - if: always()
       name: Publish results
@@ -824,7 +876,7 @@ jobs:
       with:
         python-version: 3.7
     - name: Install dependencies
-      run: pip install limnoria==2021.06.15 cryptography pyxmpp2-scram
+      run: pip install limnoria==2022.03.17 cryptography pyxmpp2-scram
     - name: Install Atheme
       run: sudo apt-get install atheme-services
     - name: Install irctest dependencies
@@ -1022,7 +1074,7 @@ jobs:
       with:
         python-version: 3.7
     - name: Install dependencies
-      run: pip install sopel==7.1.1
+      run: pip install sopel==7.1.8
     - name: Install Atheme
       run: sudo apt-get install atheme-services
     - name: Install irctest dependencies
@@ -1070,6 +1122,38 @@ jobs:
       with:
         name: pytest results unrealircd (stable)
         path: pytest.xml
+  test-unrealircd-5:
+    needs:
+    - build-unrealircd-5
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+    - name: Download build artefacts
+      uses: actions/download-artifact@v2
+      with:
+        name: installed-unrealircd-5
+        path: '~'
+    - name: Unpack artefacts
+      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
+    - name: Install Atheme
+      run: sudo apt-get install atheme-services
+    - 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
+        make unrealircd-5
+    - if: always()
+      name: Publish results
+      uses: actions/upload-artifact@v2
+      with:
+        name: pytest results unrealircd-5 (stable)
+        path: pytest.xml
   test-unrealircd-anope:
     needs:
     - build-unrealircd

Makefile

@@ -12,18 +12,26 @@ ANOPE_SELECTORS := \
 	and not testPlainLarge
 
 # buffering tests cannot pass because of issues with UTF-8 handling: https://github.com/DALnet/bahamut/issues/196
+# mask tests in test_who.py fail because they are not implemented.
+# some HelpTestCase::*[HELP] tests fail because Bahamut forwards /HELP to HelpServ (but not /HELPOP)
+# testWhowasMultiTarget fails because Bahamut returns the results in query order instead of chronological order
 BAHAMUT_SELECTORS := \
 	not Ergo \
 	and not deprecated \
 	and not strict \
 	and not IRCv3 \
 	and not buffering \
+	and not (testWho and not whois and mask) \
+	and not testWhoStar \
+	and (not HelpTestCase or HELPOP) \
+	and not testWhowasMultiTarget \
 	$(EXTRA_SELECTORS)
 
 # testQuitErrors is very flaky
 # AccountTagTestCase.testInvite fails because https://github.com/solanum-ircd/solanum/issues/166
 # testKickDefaultComment fails because it uses the nick of the kickee rather than the kicker.
 # testWhoisNumerics[oper] fails because charybdis uses RPL_WHOISSPECIAL instead of RPL_WHOISOPERATOR
+# testWhowasNoSuchNick fails because of a typo (solved in https://github.com/solanum-ircd/solanum/commit/08b7b6bd7e60a760ad47b58cbe8075b45d66166f)
 CHARYBDIS_SELECTORS := \
 	not Ergo \
 	and not deprecated \
@@ -32,49 +40,55 @@ CHARYBDIS_SELECTORS := \
 	and not testKickDefaultComment \
 	and not (AccountTagTestCase and testInvite) \
 	and not (testWhoisNumerics and oper) \
+	and not testWhowasNoSuchNick \
 	$(EXTRA_SELECTORS)
 
+# testInfoNosuchserver does not apply to Ergo: Ergo ignores the optional <target> argument
 ERGO_SELECTORS := \
 	not deprecated \
+	and not testInfoNosuchserver \
 	$(EXTRA_SELECTORS)
 
-# testInviteUnoppedModern is the only strict test that Hybrid fails
+# testInviteUnopped is the only strict test that Hybrid fails
 HYBRID_SELECTORS := \
 	not Ergo \
-	and not testInviteUnoppedModern \
+	and not testInviteUnopped \
 	and not deprecated \
 	$(EXTRA_SELECTORS)
 
-# testNoticeNonexistentChannel fails because of https://github.com/inspircd/inspircd/issues/1849
 # testBotPrivateMessage and testBotChannelMessage fail because https://github.com/inspircd/inspircd/pull/1910 is not released yet
-# testNamesInvalidChannel and testNamesNonexistingChannel fail because https://github.com/inspircd/inspircd/pull/1922 is not released yet.
+# WHOWAS tests fail because https://github.com/inspircd/inspircd/pull/1967 and https://github.com/inspircd/inspircd/pull/1968 are not released yet
 INSPIRCD_SELECTORS := \
 	not Ergo \
 	and not deprecated \
 	and not strict \
 	and not testNoticeNonexistentChannel \
 	and not testBotPrivateMessage and not testBotChannelMessage \
-	and not testNamesInvalidChannel and not testNamesNonexistingChannel \
+	and not whowas \
 	$(EXTRA_SELECTORS)
 
 # buffering tests fail because ircu2 discards the whole buffer on long lines (TODO: refine how we exclude these tests)
 # testQuit and testQuitErrors fail because ircu2 does not send ERROR or QUIT
-# lusers tests fail because they depend on Modern behavior, not just RFC2812 (TODO: update lusers tests to accept RFC2812-compliant implementations)
+# lusers "full" tests fail because they depend on Modern behavior, not just RFC2812
 # statusmsg tests fail because STATUSMSG is present in ISUPPORT, but it not actually supported as PRIVMSG target
 # testKeyValidation[empty] fails because ircu2 returns ERR_NEEDMOREPARAMS on empty keys: https://github.com/UndernetIRC/ircu2/issues/13
 # testKickDefaultComment fails because it uses the nick of the kickee rather than the kicker.
 # testEmptyRealname fails because it uses a default value instead of ERR_NEEDMOREPARAMS.
+# HelpTestCase fails because it returns NOTICEs instead of numerics
+# testWhowasCountZero fails: https://github.com/UndernetIRC/ircu2/pull/19
 IRCU2_SELECTORS := \
 	not Ergo \
 	and not deprecated \
 	and not strict \
 	and not buffering \
 	and not testQuit \
-	and not lusers \
+	and not (lusers and full) \
 	and not statusmsg \
 	and not (testKeyValidation and empty) \
 	and not testKickDefaultComment \
 	and not testEmptyRealname \
+	and not HelpTestCase \
+	and not testWhowasCountZero \
 	$(EXTRA_SELECTORS)
 
 # same justification as ircu2
@@ -84,13 +98,14 @@ SNIRCD_SELECTORS := \
 	and not strict \
 	and not buffering \
 	and not testQuit \
-	and not lusers \
+	and not (lusers and full) \
 	and not statusmsg \
 	$(EXTRA_SELECTORS)
 
 # testListEmpty and testListOne fails because irc2 deprecated LIST
 # testKickDefaultComment fails because it uses the nick of the kickee rather than the kicker.
 # testWallopsPrivileges fails because it ignores the command instead of replying ERR_UNKNOWNCOMMAND
+# HelpTestCase fails because it returns NOTICEs instead of numerics
 IRC2_SELECTORS := \
 	not Ergo \
 	and not deprecated \
@@ -98,6 +113,7 @@ IRC2_SELECTORS := \
 	and not testListEmpty and not testListOne \
 	and not testKickDefaultComment \
 	and not testWallopsPrivileges \
+	and not HelpTestCase \
 	$(EXTRA_SELECTORS)
 
 MAMMON_SELECTORS := \
@@ -110,6 +126,7 @@ MAMMON_SELECTORS := \
 # testStarNick: wat
 # testEmptyRealname fails because it uses a default value instead of ERR_NEEDMOREPARAMS.
 # chathistory tests fail because they need nicks longer than 9 chars
+# HelpTestCase::*[HELP] fails because it returns NOTICEs instead of numerics
 NGIRCD_SELECTORS := \
 	not Ergo \
 	and not deprecated \
@@ -118,14 +135,15 @@ NGIRCD_SELECTORS := \
 	and not testStarNick \
 	and not testEmptyRealname \
 	and not chathistory \
+	and (not HelpTestCase or HELPOP) \
 	$(EXTRA_SELECTORS)
 
-# testInviteUnoppedModern is the only strict test that Plexus4 fails
+# testInviteUnopped is the only strict test that Plexus4 fails
-# testInviteInviteOnlyModern fails because Plexus4 allows non-op to invite if (and only if) the channel is not invite-only
+# testInviteInviteOnly fails because Plexus4 allows non-op to invite if (and only if) the channel is not invite-only
 PLEXUS4_SELECTORS := \
 	not Ergo \
-	and not testInviteUnoppedModern \
+	and not testInviteUnopped \
-	and not testInviteInviteOnlyModern \
+	and not testInviteInviteOnly \
 	and not deprecated \
 	$(EXTRA_SELECTORS)
 
@@ -159,6 +177,8 @@ SOPEL_SELECTORS := \
 # Tests marked with private_chathistory can't pass because Unreal does not implement CHATHISTORY for DMs
 # testChathistory[BETWEEN] fails: https://bugs.unrealircd.org/view.php?id=5952
 # testChathistory[AROUND] fails: https://bugs.unrealircd.org/view.php?id=5953
+# testWhoAllOpers fails because Unreal skips results when the mask is too broad
+# HELP and HELPOP tests fail because Unreal uses custom numerics https://github.com/unrealircd/unrealircd/pull/184
 UNREALIRCD_SELECTORS := \
 	not Ergo \
 	and not deprecated \
@@ -172,6 +192,8 @@ UNREALIRCD_SELECTORS := \
 	and not react_tag \
 	and not private_chathistory \
 	and not (testChathistory and (between or around)) \
+	and not testWhoAllOpers \
+	and not HelpTestCase \
 	$(EXTRA_SELECTORS)
 
 .PHONY: all flakes bahamut charybdis ergo inspircd ircu2 snircd irc2 mammon limnoria sopel solanum unrealircd
@@ -218,7 +240,7 @@ ergo:
 hybrid:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller irctest.controllers.hybrid \
-		-m 'not services' \
+		--services-controller=irctest.controllers.anope_services \
 		-k "$(HYBRID_SELECTORS)"
 
 inspircd:
@@ -275,7 +297,7 @@ mammon:
 plexus4:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller irctest.controllers.plexus4 \
-		-m 'not services' \
+		--services-controller=irctest.controllers.anope_services \
 		-k "$(PLEXUS4_SELECTORS)"
 
 ngircd:
@@ -316,6 +338,8 @@ unrealircd:
 		-m 'not services' \
 		-k '$(UNREALIRCD_SELECTORS)'
 
+unrealircd-5: unrealircd
+
 unrealircd-atheme:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller=irctest.controllers.unrealircd \

README.md

@@ -111,7 +111,7 @@ git clone https://github.com/inspircd/inspircd.git
 cd inspircd
 
 # optional, makes tests run considerably faster
-patch src/inspircd.cpp < ~/irctest/inspircd_mainloop.patch
+patch src/inspircd.cpp < ~/irctest/patches/inspircd_mainloop.patch
 
 ./configure --prefix=$HOME/.local/ --development
 make -j 4

conftest.py

@@ -106,7 +106,13 @@ def pytest_collection_modifyitems(session, config, items):
         assert isinstance(item, _pytest.python.Function)
 
         # unittest-style test functions have the node of UnitTest class as parent
-        assert isinstance(item.parent, _pytest.python.Instance)
+        assert isinstance(
+            item.parent,
+            (
+                _pytest.python.Class,  # pytest >= 7.0.0
+                _pytest.python.Instance,  # pytest < 7.0.0
+            ),
+        )
 
         # and that node references the UnitTest class
         assert issubclass(item.parent.cls, _IrcTestCase)

irctest/cases.py

@@ -162,7 +162,7 @@ class _IrcTestCase(Generic[TController]):
                     msg=msg,
                 )
 
-        if prefix and not patma.match_string(msg.prefix, prefix):
+        if prefix is not None and not patma.match_string(msg.prefix, prefix):
             fail_msg = (
                 fail_msg or "expected prefix to match {expects}, got {got}: {msg}"
             )
@@ -170,7 +170,7 @@ class _IrcTestCase(Generic[TController]):
                 *extra_format, got=msg.prefix, expects=prefix, msg=msg
             )
 
-        if params and not patma.match_list(list(msg.params), params):
+        if params is not None and not patma.match_list(list(msg.params), params):
             fail_msg = (
                 fail_msg or "expected params to match {expects}, got {got}: {msg}"
             )
@@ -178,11 +178,11 @@ class _IrcTestCase(Generic[TController]):
                 *extra_format, got=msg.params, expects=params, msg=msg
             )
 
-        if tags and not patma.match_dict(msg.tags, tags):
+        if tags is not None and not patma.match_dict(msg.tags, tags):
             fail_msg = fail_msg or "expected tags to match {expects}, got {got}: {msg}"
             return fail_msg.format(*extra_format, got=msg.tags, expects=tags, msg=msg)
 
-        if nick:
+        if nick is not None:
             got_nick = msg.prefix.split("!")[0] if msg.prefix else None
             if nick != got_nick:
                 fail_msg = (
@@ -539,13 +539,10 @@ class BaseServerTestCase(
         if self.run_services:
             self.controller.wait_for_services()
         if not name:
-            new_name: int = (
+            used_ids: List[int] = [
-                max(
+                int(name) for name in self.clients if isinstance(name, (int, str))
-                    [int(name) for name in self.clients if isinstance(name, (int, str))]
+            ]
-                    + [0]
+            new_name = max(used_ids + [0]) + 1
-                )
-                + 1
-            )
             name = cast(TClientName, new_name)
         show_io = show_io if show_io is not None else self.show_io
         self.clients[name] = client_mock.ClientMock(name=name, show_io=show_io)
@@ -647,6 +644,16 @@ class BaseServerTestCase(
             else:
                 raise
 
+    def authenticateClient(
+        self, client: TClientName, account: str, password: str
+    ) -> None:
+        self.sendLine(client, "AUTHENTICATE PLAIN")
+        m = self.getRegistrationMessage(client)
+        self.assertMessageMatch(m, command="AUTHENTICATE", params=["+"])
+        self.sendLine(client, sasl_plain_blob(account, password))
+        m = self.getRegistrationMessage(client)
+        self.assertIn(m.command, ["900", "903"], str(m))
+
     def connectClient(
         self,
         nick: str,
@@ -670,12 +677,7 @@ class BaseServerTestCase(
         if password is not None:
             if "sasl" not in (capabilities or ()):
                 raise ValueError("Used 'password' option without sasl capbilitiy")
-            self.sendLine(client, "AUTHENTICATE PLAIN")
+            self.authenticateClient(client, account or nick, password)
-            m = self.getRegistrationMessage(client)
-            self.assertMessageMatch(m, command="AUTHENTICATE", params=["+"])
-            self.sendLine(client, sasl_plain_blob(account or nick, password))
-            m = self.getRegistrationMessage(client)
-            self.assertIn(m.command, ["900", "903"], str(m))
 
         self.sendLine(client, "NICK {}".format(nick))
         self.sendLine(client, "USER %s * * :Realname" % (ident,))

irctest/client_tests/sasl.py

@@ -84,8 +84,9 @@ class SaslTestCase(cases.BaseClientTestCase, cases.OptionalityHelper):
         m = self.getMessage()
         self.assertMessageMatch(m, command="CAP")
 
+    @pytest.mark.parametrize("pattern", ["barbaz", "éèà"])
     @cases.OptionalityHelper.skipUnlessHasMechanism("PLAIN")
-    def testPlainLarge(self):
+    def testPlainLarge(self, pattern):
         """Test the client splits large AUTHENTICATE messages whose payload
         is not a multiple of 400.
         <http://ircv3.net/specs/extensions/sasl-3.1.html#the-authenticate-command>
@@ -94,10 +95,10 @@ class SaslTestCase(cases.BaseClientTestCase, cases.OptionalityHelper):
         auth = authentication.Authentication(
             mechanisms=[authentication.Mechanisms.plain],
             username="foo",
-            password="bar" * 200,
+            password=pattern * 100,
         )
         authstring = base64.b64encode(
-            b"\x00".join([b"foo", b"foo", b"bar" * 200])
+            b"\x00".join([b"foo", b"foo", pattern.encode() * 100])
         ).decode()
         m = self.negotiateCapabilities(["sasl"], auth=auth)
         self.assertEqual(m, Message({}, None, "AUTHENTICATE", ["PLAIN"]))
@@ -114,7 +115,8 @@ class SaslTestCase(cases.BaseClientTestCase, cases.OptionalityHelper):
         self.assertEqual(m, Message({}, None, "CAP", ["END"]))
 
     @cases.OptionalityHelper.skipUnlessHasMechanism("PLAIN")
-    def testPlainLargeMultiple(self):
+    @pytest.mark.parametrize("pattern", ["quux", "éè"])
+    def testPlainLargeMultiple(self, pattern):
         """Test the client splits large AUTHENTICATE messages whose payload
         is a multiple of 400.
         <http://ircv3.net/specs/extensions/sasl-3.1.html#the-authenticate-command>
@@ -123,10 +125,10 @@ class SaslTestCase(cases.BaseClientTestCase, cases.OptionalityHelper):
         auth = authentication.Authentication(
             mechanisms=[authentication.Mechanisms.plain],
             username="foo",
-            password="quux" * 148,
+            password=pattern * 148,
         )
         authstring = base64.b64encode(
-            b"\x00".join([b"foo", b"foo", b"quux" * 148])
+            b"\x00".join([b"foo", b"foo", pattern.encode() * 148])
         ).decode()
         m = self.negotiateCapabilities(["sasl"], auth=auth)
         self.assertEqual(m, Message({}, None, "AUTHENTICATE", ["PLAIN"]))

irctest/client_tests/tls.py

@@ -1,6 +1,8 @@
 import socket
 import ssl
 
+import pytest
+
 from irctest import cases, runner, tls
 from irctest.exceptions import ConnectionClosed
 from irctest.patma import ANYSTR
@@ -148,7 +150,8 @@ class StsTestCase(cases.BaseClientTestCase, cases.OptionalityHelper):
         super().tearDown()
 
     @cases.mark_capabilities("sts")
-    def testSts(self):
+    @pytest.mark.parametrize("portOnSecure", [False, True])
+    def testSts(self, portOnSecure):
         if not self.controller.supports_sts:
             raise runner.CapabilityNotSupported("sts")
         tls_config = tls.TlsConfig(
@@ -176,10 +179,12 @@ class StsTestCase(cases.BaseClientTestCase, cases.OptionalityHelper):
         # and reconnect securely on the stated port."
         self.acceptClient(tls_cert=GOOD_CERT, tls_key=GOOD_KEY)
 
-        # Send the STS policy, over secure connection this time
+        # Send the STS policy, over secure connection this time.
-        self.sendLine(
+        if portOnSecure:
-            "CAP * LS :sts=duration=10,port={}".format(self.server.getsockname()[1])
+            # Should be ignored
-        )
+            self.sendLine("CAP * LS :sts=duration=10,port=12345")
+        else:
+            self.sendLine("CAP * LS :sts=duration=10")
 
         # Make the client reconnect. It should reconnect to the secure server.
         self.sendLine("ERROR :closing link")

irctest/controllers/charybdis.py

@@ -12,6 +12,9 @@ serverinfo {{
 
 general {{
     throttle_count = 100;  # We need to connect lots of clients quickly
+    # disable throttling for LIST and similar:
+    pace_wait_simple = 0 second;
+    pace_wait = 0 second;
     sasl_service = "SaslServ";
 }};
 

irctest/controllers/hybrid.py

@@ -40,7 +40,7 @@ class {{
 }};
 connect {{
     name = "services.example.org";
-    host = "localhost";  # Used to validate incoming connection
+    host = "127.0.0.1";  # Used to validate incoming connection
     port = 0;  # We don't need servers to connect to services
     send_password = "password";
     accept_password = "password";

irctest/controllers/inspircd.py

@@ -17,12 +17,14 @@ TEMPLATE_CONFIG = """
     resolvehostnames="no" # Faster
     recvq="40960" # Needs to be larger than a valid message with tags
     timeout="10"  # So tests don't hang too long
+    localmax="1000"
+    globalmax="1000"
     {password_field}>
 
 <class
     name="ServerOperators"
     commands="WALLOPS GLOBOPS"
-    privs="channels/auspex users/auspex channels/auspex servers/auspex users/mass-message"
+    privs="channels/auspex users/auspex channels/auspex servers/auspex"
     >
 <type
     name="NetAdmin"
@@ -72,8 +74,14 @@ TEMPLATE_CONFIG = """
 <module name="monitor">
 <module name="m_muteban">  # for testing mute extbans
 <module name="namesx"> # For multi-prefix
+<module name="noctcp">
 <module name="sasl">
 
+# HELP/HELPOP
+<module name="alias">  # for the HELP alias
+<module name="helpop">
+<include file="examples/helpop.conf.example">
+
 # Misc:
 <log method="file" type="*" level="debug" target="/tmp/ircd-{port}.log">
 <server name="My.Little.Server" description="testnet" id="000" network="testnet">

irctest/controllers/limnoria.py

@@ -55,13 +55,19 @@ class LimnoriaController(BaseClientController, DirectoryBasedController):
         # Runs a client with the config given as arguments
         assert self.proc is None
         self.create_config()
+
+        username = password = ""
+        mechanisms = ""
         if auth:
             mechanisms = " ".join(mech.to_string() for mech in auth.mechanisms)
             if auth.ecdsa_key:
                 with self.open_file("ecdsa_key.pem") as fd:
                     fd.write(auth.ecdsa_key)
-        else:
+
-            mechanisms = ""
+            if auth.username:
+                username = auth.username.encode("unicode_escape").decode()
+            if auth.password:
+                password = auth.password.encode("unicode_escape").decode()
         with self.open_file("bot.conf") as fd:
             fd.write(
                 TEMPLATE_CONFIG.format(
@@ -69,8 +75,8 @@ class LimnoriaController(BaseClientController, DirectoryBasedController):
                     loglevel="CRITICAL",
                     hostname=hostname,
                     port=port,
-                    username=auth.username if auth else "",
+                    username=username,
-                    password=auth.password if auth else "",
+                    password=password,
                     mechanisms=mechanisms.lower(),
                     enable_tls=tls_config.enable if tls_config else "False",
                     trusted_fingerprints=" ".join(tls_config.trusted_fingerprints)

irctest/controllers/ngircd.py

@@ -26,6 +26,9 @@ TEMPLATE_CONFIG = """
     Passive = yes  # don't connect to it
     ServiceMask = *Serv
 
+[Options]
+    MorePrivacy = no  # by default, always replies to WHOWAS with ERR_WASNOSUCHNICK
+
 [Operator]
     Name = operuser
     Password = operpassword

irctest/controllers/plexus4.py

@@ -45,7 +45,7 @@ class {{
 }};
 connect {{
     name = "services.example.org";
-    host = "localhost";  # Used to validate incoming connection
+    host = "127.0.0.1";  # Used to validate incoming connection
     port = 0;  # We don't need servers to connect to services
     send_password = "password";
     accept_password = "password";

irctest/controllers/unrealircd.py

@@ -1,5 +1,10 @@
+import functools
 import os
+import pathlib
+import shutil
+import signal
 import subprocess
+import textwrap
 from typing import Optional, Set, Type
 
 from irctest.basecontrollers import (
@@ -12,6 +17,8 @@ from irctest.irc_utils.junkdrawer import find_hostname_and_port
 TEMPLATE_CONFIG = """
 include "modules.default.conf";
 include "operclass.default.conf";
+{extras}
+include "help/help.conf";
 
 me {{
     name "My.Little.Server";
@@ -87,6 +94,7 @@ set {{
         // Prevent throttling, especially test_buffering.py which
         // triggers anti-flood with its very long lines
         unknown-users {{
+            nick-flood 255:10;
             lag-penalty 1;
             lag-penalty-bytes 10000;
         }}
@@ -101,6 +109,10 @@ tld {{
     rules "{empty_file}";
 }}
 
+files {{
+    tunefile "{empty_file}";
+}}
+
 oper "operuser" {{
     password = "operpassword";
     mask *;
@@ -110,12 +122,23 @@ oper "operuser" {{
 """
 
 
+@functools.lru_cache()
+def installed_version() -> int:
+    output = subprocess.check_output(["unrealircd", "-v"], universal_newlines=True)
+    if output.startswith("UnrealIRCd-5."):
+        return 5
+    elif output.startswith("UnrealIRCd-6."):
+        return 6
+    else:
+        assert False, f"unexpected version: {output}"
+
+
 class UnrealircdController(BaseServerController, DirectoryBasedController):
     software_name = "UnrealIRCd"
     supported_sasl_mechanisms = {"PLAIN"}
     supports_sts = False
 
-    extban_mute_char = "q"
+    extban_mute_char = "quiet" if installed_version() >= 6 else "q"
 
     def create_config(self) -> None:
         super().create_config()
@@ -155,6 +178,16 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
             # Unreal refuses to start without TLS enabled
             (tls_hostname, tls_port) = (unused_hostname, unused_port)
 
+        if installed_version() >= 6:
+            extras = textwrap.dedent(
+                """
+                include "snomasks.default.conf";
+                loadmodule "cloak_md5";
+                """
+            )
+        else:
+            extras = ""
+
         with self.open_file("empty.txt") as fd:
             fd.write("\n")
 
@@ -172,10 +205,29 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
                     key_path=self.key_path,
                     pem_path=self.pem_path,
                     empty_file=os.path.join(self.directory, "empty.txt"),
+                    extras=extras,
                 )
             )
+
+        proot_cmd = []
+        self.using_proot = False
+        if shutil.which("proot"):
+            unrealircd_path = shutil.which("unrealircd")
+            if unrealircd_path:
+                unrealircd_prefix = pathlib.Path(unrealircd_path).parents[1]
+                tmpdir = os.path.join(self.directory, "tmp")
+                os.mkdir(tmpdir)
+                # Unreal cleans its tmp/ directory after each run, which prevents
+                # multiple processes from running at the same time.
+                # Using PRoot, we can isolate them, with a tmp/ directory for each
+                # process, so they don't interfere with each other, allowing use of
+                # the -n option (of pytest-xdist) to speed-up tests
+                proot_cmd = ["proot", "-b", f"{tmpdir}:{unrealircd_prefix}/tmp"]
+                self.using_proot = True
+
         self.proc = subprocess.Popen(
             [
+                *proot_cmd,
                 "unrealircd",
                 "-t",
                 "-F",  # BOOT_NOFORK
@@ -196,6 +248,18 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
                 server_port=services_port,
             )
 
+    def kill(self) -> None:
+        if self.using_proot:
+            # Kill grandchild process, instead of killing proot, which takes more
+            # time (and does not seem to always work)
+            assert self.proc is not None
+            output = subprocess.check_output(
+                ["ps", "-opid", "--no-headers", "--ppid", str(self.proc.pid)]
+            )
+            (grandchild_pid,) = [int(line) for line in output.decode().split()]
+            os.kill(grandchild_pid, signal.SIGKILL)
+        super().kill()
+
 
 def get_irctest_controller_class() -> Type[UnrealircdController]:
     return UnrealircdController

irctest/numerics.py

@@ -86,6 +86,7 @@ RPL_ENDOFEXCEPTLIST = "349"
 RPL_VERSION = "351"
 RPL_WHOREPLY = "352"
 RPL_NAMREPLY = "353"
+RPL_WHOSPCRPL = "354"
 RPL_LINKS = "364"
 RPL_ENDOFLINKS = "365"
 RPL_ENDOFNAMES = "366"

irctest/patma.py

@@ -13,18 +13,18 @@ class Operator:
         pass
 
 
-class AnyStr(Operator):
+class _AnyStr(Operator):
     """Wildcard matching any string"""
 
     def __repr__(self) -> str:
-        return "AnyStr"
+        return "ANYSTR"
 
 
-class AnyOptStr(Operator):
+class _AnyOptStr(Operator):
     """Wildcard matching any string as well as None"""
 
     def __repr__(self) -> str:
-        return "AnyOptStr"
+        return "ANYOPTSTR"
 
 
 @dataclasses.dataclass(frozen=True)
@@ -43,6 +43,14 @@ class NotStrRe(Operator):
         return f"NotStrRe(r'{self.regexp}')"
 
 
+@dataclasses.dataclass(frozen=True)
+class InsensitiveStr(Operator):
+    string: str
+
+    def __repr__(self) -> str:
+        return f"InsensitiveStr({self.string!r})"
+
+
 @dataclasses.dataclass(frozen=True)
 class RemainingKeys(Operator):
     """Used in a dict pattern to match all remaining keys.
@@ -51,30 +59,42 @@ class RemainingKeys(Operator):
     key: Operator
 
     def __repr__(self) -> str:
-        return f"Keys({self.key!r})"
+        return f"RemainingKeys({self.key!r})"
 
 
-ANYSTR = AnyStr()
+ANYSTR = _AnyStr()
 """Singleton, spares two characters"""
 
-ANYDICT = {RemainingKeys(ANYSTR): AnyOptStr()}
+ANYOPTSTR = _AnyOptStr()
+"""Singleton, spares two characters"""
+
+ANYDICT = {RemainingKeys(ANYSTR): ANYOPTSTR}
 """Matches any dictionary; useful to compare tags dict, eg.
 `match_dict(got_tags, {"label": "foo", **ANYDICT})`"""
 
 
-class _AnyListRemainder:
+@dataclasses.dataclass(frozen=True)
+class ListRemainder:
+    item: Operator
+    min_length: int = 0
+
     def __repr__(self) -> str:
-        return "*ANYLIST"
+        if self.min_length:
+            return f"ListRemainder({self.item!r}, min_length={self.min_length})"
+        elif self.item is ANYSTR:
+            return "*ANYLIST"
+        else:
+            return f"ListRemainder({self.item!r})"
 
 
-ANYLIST = [_AnyListRemainder()]
+ANYLIST = [ListRemainder(ANYSTR)]
 """Matches any list remainder"""
 
 
 def match_string(got: Optional[str], expected: Union[str, Operator, None]) -> bool:
-    if isinstance(expected, AnyOptStr):
+    if isinstance(expected, _AnyOptStr):
         return True
-    elif isinstance(expected, AnyStr) and got is not None:
+    elif isinstance(expected, _AnyStr) and got is not None:
         return True
     elif isinstance(expected, StrRe):
         if got is None or not re.match(expected.regexp, got):
@@ -82,6 +102,9 @@ def match_string(got: Optional[str], expected: Union[str, Operator, None]) -> bo
     elif isinstance(expected, NotStrRe):
         if got is None or re.match(expected.regexp, got):
             return False
+    elif isinstance(expected, InsensitiveStr):
+        if got is None or got.lower() != expected.string.lower():
+            return False
     elif isinstance(expected, Operator):
         raise NotImplementedError(f"Unsupported operator: {expected}")
     elif got != expected:
@@ -98,9 +121,13 @@ def match_list(
     The ANYSTR operator can be used on the 'expected' side as a wildcard,
     matching any *single* value; and StrRe("<regexp>") can be used to match regular
     expressions"""
-    if expected[-1] is ANYLIST[0]:
+    if expected and isinstance(expected[-1], ListRemainder):
-        expected = expected[0:-1]
+        # Expand the 'expected' list to have as many items as the 'got' list
-        got = got[0 : len(expected)]  # Ignore remaining
+        expected = list(expected)  # copy
+        remainder = expected.pop()
+        nb_remaining_items = len(got) - len(expected)
+        expected += [remainder.item] * max(nb_remaining_items, remainder.min_length)
+
     if len(got) != len(expected):
         return False
     return all(

irctest/runner.py

@@ -14,6 +14,11 @@ class ImplementationChoice(unittest.SkipTest):
         )
 
 
+class OptionalCommandNotSupported(unittest.SkipTest):
+    def __str__(self) -> str:
+        return "Unsupported command: {}".format(self.args[0])
+
+
 class OptionalExtensionNotSupported(unittest.SkipTest):
     def __str__(self) -> str:
         return "Unsupported extension: {}".format(self.args[0])

irctest/self_tests/cases.py

@@ -4,10 +4,19 @@ import pytest
 
 from irctest import cases
 from irctest.irc_utils.message_parser import parse_message
-from irctest.patma import ANYDICT, ANYSTR, AnyOptStr, NotStrRe, RemainingKeys, StrRe
+from irctest.patma import (
+    ANYDICT,
+    ANYLIST,
+    ANYOPTSTR,
+    ANYSTR,
+    ListRemainder,
+    NotStrRe,
+    RemainingKeys,
+    StrRe,
+)
 
 # fmt: off
-MESSAGE_SPECS: List[Tuple[Dict, List[str], List[str]]] = [
+MESSAGE_SPECS: List[Tuple[Dict, List[str], List[str], List[str]]] = [
     (
         # the specification:
         dict(
@@ -27,6 +36,11 @@ MESSAGE_SPECS: List[Tuple[Dict, List[str], List[str]]] = [
         [
             "PRIVMSG #chan hello2",
             "PRIVMSG #chan2 hello",
+        ],
+        # and they each error with:
+        [
+            "expected params to match ['#chan', 'hello'], got ['#chan', 'hello2']",
+            "expected params to match ['#chan', 'hello'], got ['#chan2', 'hello']",
         ]
     ),
     (
@@ -49,6 +63,11 @@ MESSAGE_SPECS: List[Tuple[Dict, List[str], List[str]]] = [
         [
             "PRIVMSG #chan :hi",
             "PRIVMSG #chan2 hello",
+        ],
+        # and they each error with:
+        [
+            "expected params to match ['#chan', StrRe(r'hello.*')], got ['#chan', 'hi']",
+            "expected params to match ['#chan', StrRe(r'hello.*')], got ['#chan2', 'hello']",
         ]
     ),
     (
@@ -67,6 +86,12 @@ MESSAGE_SPECS: List[Tuple[Dict, List[str], List[str]]] = [
             "PRIVMSG #chan :hi",
             ":foo2!baz@qux PRIVMSG #chan hello",
             "@tag1=bar :foo2!baz@qux PRIVMSG #chan :hello",
+        ],
+        # and they each error with:
+        [
+            "expected nick to be foo, got None instead",
+            "expected nick to be foo, got foo2 instead",
+            "expected nick to be foo, got foo2 instead",
         ]
     ),
     (
@@ -87,6 +112,13 @@ MESSAGE_SPECS: List[Tuple[Dict, List[str], List[str]]] = [
             "@tag1=value1 PRIVMSG #chan :hello",
             "PRIVMSG #chan hello",
             ":foo!baz@qux PRIVMSG #chan hello",
+        ],
+        # and they each error with:
+        [
+            "expected tags to match {'tag1': 'bar'}, got {'tag1': 'bar', 'tag2': ''}",
+            "expected tags to match {'tag1': 'bar'}, got {'tag1': 'value1'}",
+            "expected tags to match {'tag1': 'bar'}, got {}",
+            "expected tags to match {'tag1': 'bar'}, got {}",
         ]
     ),
     (
@@ -107,6 +139,12 @@ MESSAGE_SPECS: List[Tuple[Dict, List[str], List[str]]] = [
             "@tag1=bar;tag2= PRIVMSG #chan :hello",
             "PRIVMSG #chan hello",
             ":foo!baz@qux PRIVMSG #chan hello",
+        ],
+        # and they each error with:
+        [
+            "expected tags to match {'tag1': ANYSTR}, got {'tag1': 'bar', 'tag2': ''}",
+            "expected tags to match {'tag1': ANYSTR}, got {}",
+            "expected tags to match {'tag1': ANYSTR}, got {}",
         ]
     ),
     (
@@ -129,12 +167,20 @@ MESSAGE_SPECS: List[Tuple[Dict, List[str], List[str]]] = [
             "PRIVMSG #chan hello2",
             "PRIVMSG #chan2 hello",
             ":foo!baz@qux PRIVMSG #chan hello",
+        ],
+        # and they each error with:
+        [
+            "expected command to be PRIVMSG, got PRIVMG",
+            "expected tags to match {'tag1': 'bar', RemainingKeys(ANYSTR): ANYOPTSTR}, got {'tag1': 'value1'}",
+            "expected params to match ['#chan', 'hello'], got ['#chan', 'hello2']",
+            "expected params to match ['#chan', 'hello'], got ['#chan2', 'hello']",
+            "expected tags to match {'tag1': 'bar', RemainingKeys(ANYSTR): ANYOPTSTR}, got {}",
         ]
     ),
     (
         # the specification:
         dict(
-            tags={"tag1": "bar", RemainingKeys(NotStrRe("tag2")): AnyOptStr()},
+            tags={"tag1": "bar", RemainingKeys(NotStrRe("tag2")): ANYOPTSTR},
             command="PRIVMSG",
             params=["#chan", "hello"],
         ),
@@ -150,6 +196,98 @@ MESSAGE_SPECS: List[Tuple[Dict, List[str], List[str]]] = [
             "@tag1=value1 PRIVMSG #chan :hello",
             "@tag1=bar;tag2= PRIVMSG #chan :hello",
             "@tag1=bar;tag2=baz PRIVMSG #chan :hello",
+        ],
+        # and they each error with:
+        [
+            "expected command to be PRIVMSG, got PRIVMG",
+            "expected tags to match {'tag1': 'bar', RemainingKeys(NotStrRe(r'tag2')): ANYOPTSTR}, got {'tag1': 'value1'}",
+            "expected tags to match {'tag1': 'bar', RemainingKeys(NotStrRe(r'tag2')): ANYOPTSTR}, got {'tag1': 'bar', 'tag2': ''}",
+            "expected tags to match {'tag1': 'bar', RemainingKeys(NotStrRe(r'tag2')): ANYOPTSTR}, got {'tag1': 'bar', 'tag2': 'baz'}",
+        ]
+    ),
+    (
+        # the specification:
+        dict(
+            command="005",
+            params=["nick", "FOO=1", *ANYLIST],
+        ),
+        # matches:
+        [
+            "005 nick FOO=1",
+            "005 nick FOO=1 BAR=2",
+        ],
+        # and does not match:
+        [
+            "005 nick",
+            "005 nick BAR=2",
+        ],
+        # and they each error with:
+        [
+            "expected params to match ['nick', 'FOO=1', *ANYLIST], got ['nick']",
+            "expected params to match ['nick', 'FOO=1', *ANYLIST], got ['nick', 'BAR=2']",
+        ]
+    ),
+    (
+        # the specification:
+        dict(
+            command="005",
+            params=["nick", ListRemainder(ANYSTR, min_length=1)],
+        ),
+        # matches:
+        [
+            "005 nick FOO=1",
+            "005 nick FOO=1 BAR=2",
+            "005 nick BAR=2",
+        ],
+        # and does not match:
+        [
+            "005 nick",
+        ],
+        # and they each error with:
+        [
+            "expected params to match ['nick', ListRemainder(ANYSTR, min_length=1)], got ['nick']",
+        ]
+    ),
+    (
+        # the specification:
+        dict(
+            command="005",
+            params=["nick", ListRemainder(StrRe("[A-Z]+=.*"), min_length=1)],
+        ),
+        # matches:
+        [
+            "005 nick FOO=1",
+            "005 nick FOO=1 BAR=2",
+            "005 nick BAR=2",
+        ],
+        # and does not match:
+        [
+            "005 nick",
+            "005 nick foo=1",
+        ],
+        # and they each error with:
+        [
+            "expected params to match ['nick', ListRemainder(StrRe(r'[A-Z]+=.*'), min_length=1)], got ['nick']",
+            "expected params to match ['nick', ListRemainder(StrRe(r'[A-Z]+=.*'), min_length=1)], got ['nick', 'foo=1']",
+        ]
+    ),
+    (
+        # the specification:
+        dict(
+            command="PING",
+            params=["abc"]
+        ),
+        # matches:
+        [
+            "PING abc",
+        ],
+        # and does not match:
+        [
+            "PONG def"
+        ],
+        # and they each error with:
+        [
+            "expected command to be PING, got PONG"
         ]
     ),
 ]
@@ -161,7 +299,7 @@ class IrcTestCaseTestCase(cases._IrcTestCase):
         "spec,msg",
         [
             pytest.param(spec, msg, id=f"{spec}-{msg}")
-            for (spec, positive_matches, _) in MESSAGE_SPECS
+            for (spec, positive_matches, _, _) in MESSAGE_SPECS
             for msg in positive_matches
         ],
     )
@@ -174,7 +312,7 @@ class IrcTestCaseTestCase(cases._IrcTestCase):
         "spec,msg",
         [
             pytest.param(spec, msg, id=f"{spec}-{msg}")
-            for (spec, _, negative_matches) in MESSAGE_SPECS
+            for (spec, _, negative_matches, _) in MESSAGE_SPECS
             for msg in negative_matches
         ],
     )
@@ -183,3 +321,14 @@ class IrcTestCaseTestCase(cases._IrcTestCase):
         assert not self.messageEqual(parse_message(msg), **spec), msg
         with pytest.raises(AssertionError):
             self.assertMessageMatch(parse_message(msg), **spec), msg
+
+    @pytest.mark.parametrize(
+        "spec,msg,error_string",
+        [
+            pytest.param(spec, msg, error_string, id=error_string)
+            for (spec, _, negative_matches, error_stringgexps) in MESSAGE_SPECS
+            for (msg, error_string) in zip(negative_matches, error_stringgexps)
+        ],
+    )
+    def test_message_matching_negative_message(self, spec, msg, error_string):
+        self.assertIn(error_string, self.messageDiffers(parse_message(msg), **spec))

irctest/server_tests/chmodes/ban.py

@@ -1,9 +1,10 @@
 from irctest import cases
-from irctest.numerics import ERR_BANNEDFROMCHAN
+from irctest.numerics import ERR_BANNEDFROMCHAN, RPL_BANLIST, RPL_ENDOFBANLIST
+from irctest.patma import ANYSTR, StrRe
 
 
 class BanModeTestCase(cases.BaseServerTestCase):
-    @cases.mark_specifications("RFC1459", "RFC2812")
+    @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
     def testBan(self):
         """Basic ban operation"""
         self.connectClient("chanop", name="chanop")
@@ -23,6 +24,52 @@ class BanModeTestCase(cases.BaseServerTestCase):
         self.sendLine("bar", "JOIN #chan")
         self.assertMessageMatch(self.getMessage("bar"), command="JOIN")
 
+    @cases.mark_specifications("Modern")
+    def testBanList(self):
+        """https://github.com/ircdocs/modern-irc/pull/125"""
+        self.connectClient("chanop")
+        self.joinChannel(1, "#chan")
+        self.getMessages(1)
+        self.sendLine(1, "MODE #chan +b bar!*@*")
+        self.assertMessageMatch(self.getMessage(1), command="MODE")
+
+        self.sendLine(1, "MODE #chan +b")
+
+        m = self.getMessage(1)
+        if len(m.params) == 3:
+            # Old format
+            self.assertMessageMatch(
+                m,
+                command=RPL_BANLIST,
+                params=[
+                    "chanop",
+                    "#chan",
+                    "bar!*@*",
+                ],
+            )
+        else:
+            self.assertMessageMatch(
+                m,
+                command=RPL_BANLIST,
+                params=[
+                    "chanop",
+                    "#chan",
+                    "bar!*@*",
+                    StrRe("chanop(!.*@.*)?"),
+                    StrRe("[0-9]+"),
+                ],
+            )
+
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command=RPL_ENDOFBANLIST,
+            params=[
+                "chanop",
+                "#chan",
+                ANYSTR,
+            ],
+        )
+
     @cases.mark_specifications("Ergo")
     def testCaseInsensitive(self):
         """Some clients allow unsetting modes if their argument matches

irctest/server_tests/chmodes/mute_extban.py

@@ -16,7 +16,7 @@ class MuteExtbanTestCase(cases.BaseServerTestCase):
 
     @cases.mark_specifications("Ergo")
     def testISupport(self):
-        self.connectClient(1)  # Fetches ISUPPORT
+        self.connectClient("chk")  # Fetches ISUPPORT
         isupport = self.server_support
         token = isupport["EXTBAN"]
         prefix, comma, types = token.partition(",")

irctest/server_tests/chmodes/noctcp.py

@@ -0,0 +1,69 @@
+from irctest import cases, runner
+from irctest.numerics import ERR_CANNOTSENDTOCHAN
+from irctest.patma import ANYSTR
+
+
+class NoctcpModeTestCase(cases.BaseServerTestCase):
+    @cases.mark_specifications("Modern")
+    def testNoctcpMode(self):
+        """
+        "This mode is used in almost all IRC software today. The standard mode letter
+        used for it is `"+C"`.
+        When this mode is set, should not send [CTCP](/ctcp.html) messages, except
+        CTCP Action (also known as `/me`) to the channel.
+        When blocking a message because of this mode, servers SHOULD use
+        ERR_CANNOTSENDTOCHAN"
+        -- TODO add link
+        """
+        self.connectClient("chanop")
+
+        if "C" not in self.server_support.get("CHANMODES", ""):
+            raise runner.NotImplementedByController("+C (noctcp) channel mode")
+
+        # Both users join:
+
+        self.sendLine(1, "JOIN #chan")
+        self.getMessages(1)  # synchronize
+
+        self.connectClient("user")
+        self.sendLine(2, "JOIN #chan")
+        self.getMessages(2)
+        self.getMessages(1)
+
+        # Send ACTION and PING, both should go through:
+
+        self.sendLine(2, "PRIVMSG #chan :\x01ACTION is testing\x01")
+        self.sendLine(2, "PRIVMSG #chan :\x01PING 12345\x01")
+        self.assertEqual(self.getMessages(2), [])
+
+        self.assertEqual(
+            [(m.command, m.params[1]) for m in self.getMessages(1)],
+            [
+                ("PRIVMSG", "\x01ACTION is testing\x01"),
+                ("PRIVMSG", "\x01PING 12345\x01"),
+            ],
+        )
+
+        # Set mode +C:
+
+        self.sendLine(1, "MODE #chan +C")
+        self.getMessages(1)
+        self.getMessages(2)
+
+        # Send ACTION and PING, only ACTION should go through:
+
+        self.sendLine(2, "PRIVMSG #chan :\x01ACTION is testing\x01")
+        self.assertEqual(self.getMessages(2), [])
+        self.sendLine(2, "PRIVMSG #chan :\x01PING 12345\x01")
+        self.assertMessageMatch(
+            self.getMessage(2),
+            command=ERR_CANNOTSENDTOCHAN,
+            params=["user", "#chan", ANYSTR],
+        )
+
+        self.assertEqual(
+            [(m.command, m.params[1]) for m in self.getMessages(1)],
+            [
+                ("PRIVMSG", "\x01ACTION is testing\x01"),
+            ],
+        )

irctest/server_tests/chmodes/secret.py

@@ -0,0 +1,55 @@
+from irctest import cases
+from irctest.numerics import RPL_LIST
+
+
+class SecretChannelTestCase(cases.BaseServerTestCase):
+    @cases.mark_specifications("RFC1459", "Modern")
+    def testSecretChannelListCommand(self):
+        """
+        <https://datatracker.ietf.org/doc/html/rfc1459#section-4.2.6>
+
+        "Likewise, secret channels are not listed
+        at all unless the client is a member of the channel in question."
+
+        <https://modern.ircdocs.horse/#secret-channel-mode>
+        "A channel that is set to secret will not show up in responses to
+        the LIST or NAMES command unless the client sending the command is
+        joined to the channel."
+        """
+
+        def get_listed_channels(replies):
+            channels = set()
+            for reply in replies:
+                # skip pseudo-channels (&SERVER, &NOTICES) listed by ngircd
+                # and ircu:
+                if reply.command == RPL_LIST and reply.params[1].startswith("#"):
+                    channels.add(reply.params[1])
+            return channels
+
+        # test that a silent channel is shown in list if the user is in the channel.
+        self.connectClient("first", name="first")
+        self.joinChannel("first", "#gen")
+        self.getMessages("first")
+        self.sendLine("first", "MODE #gen +s")
+        # run command LIST
+        self.sendLine("first", "LIST")
+        replies = self.getMessages("first")
+        self.assertEqual(get_listed_channels(replies), {"#gen"})
+
+        # test that another client would not see the secret
+        # channel.
+        self.connectClient("second", name="second")
+        self.getMessages("second")
+        self.sendLine("second", "LIST")
+        replies = self.getMessages("second")
+        # RPL_LIST 322 should NOT be present this time.
+        self.assertEqual(get_listed_channels(replies), set())
+
+        # Second client will join the secret channel
+        # and call command LIST. The channel SHOULD
+        # appear this time.
+        self.joinChannel("second", "#gen")
+        self.sendLine("second", "LIST")
+        replies = self.getMessages("second")
+        # Should be only one line with command RPL_LIST
+        self.assertEqual(get_listed_channels(replies), {"#gen"})

irctest/server_tests/ergo/services.py

@@ -0,0 +1,25 @@
+from irctest import cases
+from irctest.numerics import RPL_YOUREOPER
+
+
+class NickservTestCase(cases.BaseServerTestCase):
+    @cases.mark_specifications("Ergo")
+    def test_saregister(self):
+        self.connectClient("root", name="root")
+        self.sendLine("root", "OPER operuser operpassword")
+        self.assertIn(RPL_YOUREOPER, {msg.command for msg in self.getMessages("root")})
+
+        self.sendLine(
+            "root",
+            "PRIVMSG NickServ :SAREGISTER saregister_test saregistertestpassphrase",
+        )
+        self.getMessages("root")
+
+        # test that the account was registered
+        self.connectClient(
+            name="saregister_test",
+            nick="saregister_test",
+            capabilities=["sasl"],
+            account="saregister_test",
+            password="saregistertestpassphrase",
+        )

irctest/server_tests/help.py

@@ -0,0 +1,98 @@
+"""
+The HELP and HELPOP command.
+"""
+
+import re
+
+import pytest
+
+from irctest import cases, runner
+from irctest.numerics import (
+    ERR_HELPNOTFOUND,
+    ERR_UNKNOWNCOMMAND,
+    RPL_ENDOFHELP,
+    RPL_HELPSTART,
+    RPL_HELPTXT,
+)
+from irctest.patma import ANYSTR, StrRe
+
+
+class HelpTestCase(cases.BaseServerTestCase):
+    def _assertValidHelp(self, messages, subject):
+        if subject != ANYSTR:
+            subject = StrRe("(?i)" + re.escape(subject))
+
+        self.assertMessageMatch(
+            messages[0],
+            command=RPL_HELPSTART,
+            params=["nick", subject, ANYSTR],
+            fail_msg=f"Expected {RPL_HELPSTART} (RPL_HELPSTART), got: {{msg}}",
+        )
+
+        self.assertMessageMatch(
+            messages[-1],
+            command=RPL_ENDOFHELP,
+            params=["nick", subject, ANYSTR],
+            fail_msg=f"Expected {RPL_ENDOFHELP} (RPL_ENDOFHELP), got: {{msg}}",
+        )
+
+        for i in range(1, len(messages) - 1):
+            self.assertMessageMatch(
+                messages[i],
+                command=RPL_HELPTXT,
+                params=["nick", subject, ANYSTR],
+                fail_msg=f"Expected {RPL_HELPTXT} (RPL_HELPTXT), got: {{msg}}",
+            )
+
+    @pytest.mark.parametrize("command", ["HELP", "HELPOP"])
+    @cases.mark_specifications("Modern")
+    def testHelpNoArg(self, command):
+        self.connectClient("nick")
+        self.sendLine(1, f"{command}")
+
+        messages = self.getMessages(1)
+
+        if messages[0].command == ERR_UNKNOWNCOMMAND:
+            raise runner.OptionalCommandNotSupported(command)
+
+        self._assertValidHelp(messages, ANYSTR)
+
+    @pytest.mark.parametrize("command", ["HELP", "HELPOP"])
+    @cases.mark_specifications("Modern")
+    def testHelpPrivmsg(self, command):
+        self.connectClient("nick")
+        self.sendLine(1, f"{command} PRIVMSG")
+        messages = self.getMessages(1)
+
+        if messages[0].command == ERR_UNKNOWNCOMMAND:
+            raise runner.OptionalCommandNotSupported(command)
+
+        self._assertValidHelp(messages, "PRIVMSG")
+
+    @pytest.mark.parametrize("command", ["HELP", "HELPOP"])
+    @cases.mark_specifications("Modern")
+    def testHelpUnknownSubject(self, command):
+        self.connectClient("nick")
+        self.sendLine(1, f"{command} THISISNOTACOMMAND")
+        messages = self.getMessages(1)
+
+        if messages[0].command == ERR_UNKNOWNCOMMAND:
+            raise runner.OptionalCommandNotSupported(command)
+
+        if messages[0].command == ERR_HELPNOTFOUND:
+            # Inspircd, Hybrid et al
+            self.assertEqual(len(messages), 1)
+            self.assertMessageMatch(
+                messages[0],
+                command=ERR_HELPNOTFOUND,
+                params=[
+                    "nick",
+                    StrRe(
+                        "(?i)THISISNOTACOMMAND"
+                    ),  # case-insensitive, for Hybrid and Plexus4 (but not Chary et al)
+                    ANYSTR,
+                ],
+            )
+        else:
+            # Unrealircd
+            self._assertValidHelp(messages, ANYSTR)

irctest/server_tests/info.py

@@ -0,0 +1,112 @@
+"""
+The INFO command.
+"""
+
+import pytest
+
+from irctest import cases
+from irctest.numerics import ERR_NOSUCHSERVER, RPL_ENDOFINFO, RPL_INFO, RPL_YOUREOPER
+from irctest.patma import ANYSTR
+
+
+class InfoTestCase(cases.BaseServerTestCase):
+    @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
+    def testInfo(self):
+        """
+        <https://datatracker.ietf.org/doc/html/rfc1459#section-4.3.8>
+        <https://datatracker.ietf.org/doc/html/rfc2812#section-3.4.10>
+
+        "Upon receiving an INFO command, the given server will respond with zero or
+        more RPL_INFO replies, followed by one RPL_ENDOFINFO numeric"
+        -- <https://modern.ircdocs.horse/#info-message>
+        """
+        self.connectClient("nick")
+
+        # Remote /INFO is oper-only on Unreal and ircu2
+        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, "INFO")
+
+        messages = self.getMessages(1)
+        last_message = messages.pop()
+
+        self.assertMessageMatch(
+            last_message, command=RPL_ENDOFINFO, params=["nick", ANYSTR]
+        )
+
+        for message in messages:
+            self.assertMessageMatch(message, command=RPL_INFO, params=["nick", ANYSTR])
+
+    @pytest.mark.parametrize(
+        "target",
+        ["My.Little.Server", "*Little*", "nick"],
+        ids=["target-server", "target-wildcard", "target-nick"],
+    )
+    @cases.mark_specifications("RFC1459", "RFC2812", deprecated=True)
+    def testInfoTarget(self, target):
+        """
+        <https://datatracker.ietf.org/doc/html/rfc1459#section-4.3.8>
+        <https://datatracker.ietf.org/doc/html/rfc2812#section-3.4.10>
+
+        "Upon receiving an INFO command, the given server will respond with zero or
+        more RPL_INFO replies, followed by one RPL_ENDOFINFO numeric"
+        -- <https://modern.ircdocs.horse/#info-message>
+        """
+        self.connectClient("nick")
+
+        # Remote /INFO is oper-only on Unreal and ircu2
+        self.sendLine(1, "OPER operuser operpassword")
+        self.assertIn(
+            RPL_YOUREOPER,
+            [m.command for m in self.getMessages(1)],
+            fail_msg="OPER failed",
+        )
+
+        if target:
+            self.sendLine(1, "INFO My.Little.Server")
+        else:
+            self.sendLine(1, "INFO")
+
+        messages = self.getMessages(1)
+        last_message = messages.pop()
+
+        self.assertMessageMatch(
+            last_message, command=RPL_ENDOFINFO, params=["nick", ANYSTR]
+        )
+
+        for message in messages:
+            self.assertMessageMatch(message, command=RPL_INFO, params=["nick", ANYSTR])
+
+    @pytest.mark.parametrize("target", ["invalid.server.example", "invalidserver"])
+    @cases.mark_specifications("RFC1459", "RFC2812", deprecated=True)
+    def testInfoNosuchserver(self, target):
+        """
+        <https://datatracker.ietf.org/doc/html/rfc1459#section-4.3.8>
+        <https://datatracker.ietf.org/doc/html/rfc2812#section-3.4.10>
+
+        "Upon receiving an INFO command, the given server will respond with zero or
+        more RPL_INFO replies, followed by one RPL_ENDOFINFO numeric"
+        -- <https://modern.ircdocs.horse/#info-message>
+        """
+        self.connectClient("nick")
+
+        # Remote /INFO is oper-only on Unreal and ircu2
+        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, f"INFO {target}")
+
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command=ERR_NOSUCHSERVER,
+            params=["nick", target, ANYSTR],
+        )

irctest/server_tests/invite.py

@@ -2,6 +2,7 @@ import pytest
 
 from irctest import cases
 from irctest.numerics import (
+    ERR_BANNEDFROMCHAN,
     ERR_CHANOPRIVSNEEDED,
     ERR_INVITEONLYCHAN,
     ERR_NOSUCHNICK,
@@ -109,7 +110,7 @@ class InviteTestCase(cases.BaseServerTestCase):
             "got this instead: {msg}",
         )
 
-    def _testInvite(self, opped, invite_only, modern):
+    def _testInvite(self, opped, invite_only):
         """
         "Only the user inviting and the user being invited will receive
         notification of the invitation."
@@ -162,23 +163,14 @@ class InviteTestCase(cases.BaseServerTestCase):
             )
 
         self.sendLine(1, "INVITE bar #chan")
-        if modern:
+        self.assertMessageMatch(
-            self.assertMessageMatch(
+            self.getMessage(1),
-                self.getMessage(1),
+            command=RPL_INVITING,
-                command=RPL_INVITING,
+            params=["foo", "bar", "#chan"],
-                params=["foo", "bar", "#chan"],
+            fail_msg=f"After “foo” invited “bar” to a channel, “foo” should have "
-                fail_msg=f"After “foo” invited “bar” to a channel, “foo” should have "
+            f"received “{RPL_INVITING} foo #chan bar” but got this instead: "
-                f"received “{RPL_INVITING} foo #chan bar” but got this instead: "
+            f"{{msg}}",
-                f"{{msg}}",
+        )
-            )
-        else:
-            self.assertMessageMatch(
-                self.getMessage(1),
-                command=RPL_INVITING,
-                params=["#chan", "bar"],
-                fail_msg=f"After “foo” invited “bar” to a channel, “foo” should have "
-                f"received “{RPL_INVITING} #chan bar” but got this instead: {{msg}}",
-            )
 
         messages = self.getMessages(2)
         self.assertNotEqual(
@@ -196,24 +188,14 @@ class InviteTestCase(cases.BaseServerTestCase):
         )
 
     @pytest.mark.parametrize("invite_only", [True, False])
-    @cases.mark_specifications("Modern")
+    @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
-    def testInviteModern(self, invite_only):
+    def testInvite(self, invite_only):
-        self._testInvite(opped=True, invite_only=invite_only, modern=True)
+        self._testInvite(opped=True, invite_only=invite_only)
 
-    @pytest.mark.parametrize("invite_only", [True, False])
+    @cases.mark_specifications("RFC1459", "RFC2812", "Modern", strict=True)
-    @cases.mark_specifications("RFC1459", "RFC2812", deprecated=True)
+    def testInviteUnopped(self):
-    def testInviteRfc(self, invite_only):
-        self._testInvite(opped=True, invite_only=invite_only, modern=False)
-
-    @cases.mark_specifications("Modern", strict=True)
-    def testInviteUnoppedModern(self):
         """Tests invites from unopped users on not-invite-only chans."""
-        self._testInvite(opped=False, invite_only=False, modern=True)
+        self._testInvite(opped=False, invite_only=False)
-
-    @cases.mark_specifications("RFC1459", "RFC2812", deprecated=True, strict=True)
-    def testInviteUnoppedRfc(self, opped, invite_only):
-        """Tests invites from unopped users on not-invite-only chans."""
-        self._testInvite(opped=False, invite_only=False, modern=False)
 
     @cases.mark_specifications("RFC2812", "Modern")
     def testInviteNoNotificationForOtherMembers(self):
@@ -247,7 +229,8 @@ class InviteTestCase(cases.BaseServerTestCase):
             "were notified: {got}",
         )
 
-    def _testInviteInviteOnly(self, modern):
+    @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
+    def testInviteInviteOnly(self):
         """
         "To invite a user to a channel which is invite only (MODE
         +i), the client sending the invite must be recognised as being a
@@ -287,35 +270,17 @@ class InviteTestCase(cases.BaseServerTestCase):
         )
 
         self.sendLine(1, "INVITE bar #chan")
-        if modern:
+        self.assertMessageMatch(
-            self.assertMessageMatch(
+            self.getMessage(1),
-                self.getMessage(1),
+            command=ERR_CHANOPRIVSNEEDED,
-                command=ERR_CHANOPRIVSNEEDED,
+            params=["foo", "#chan", ANYSTR],
-                params=["foo", "#chan", ANYSTR],
+            fail_msg=f"After “foo” invited “bar” to a channel to an invite-only "
-                fail_msg=f"After “foo” invited “bar” to a channel to an invite-only "
+            f"channel without being opped, “foo” should have received "
-                f"channel without being opped, “foo” should have received "
+            f"“{ERR_CHANOPRIVSNEEDED} foo #chan :*” but got this instead: {{msg}}",
-                f"“{ERR_CHANOPRIVSNEEDED} foo #chan :*” but got this instead: {{msg}}",
+        )
-            )
-        else:
-            self.assertMessageMatch(
-                self.getMessage(1),
-                command=ERR_CHANOPRIVSNEEDED,
-                params=["#chan", ANYSTR],
-                fail_msg=f"After “foo” invited “bar” to a channel to an invite-only "
-                f"channel without being opped, “foo” should have received "
-                f"“{ERR_CHANOPRIVSNEEDED} #chan :*” but got this instead: {{msg}}",
-            )
-
-    @cases.mark_specifications("Modern")
-    def testInviteInviteOnlyModern(self):
-        self._testInviteInviteOnly(modern=True)
-
-    @cases.mark_specifications("RFC1459", "RFC2812", deprecated=True)
-    def testInviteInviteOnlyRfc(self):
-        self._testInviteInviteOnly(modern=False)
 
     @cases.mark_specifications("RFC2812", "Modern")
-    def _testInviteOnlyFromUsersInChannel(self, modern):
+    def testInviteOnlyFromUsersInChannel(self):
         """
         "if the channel exists, only members of the channel are allowed
         to invite other users"
@@ -348,26 +313,15 @@ class InviteTestCase(cases.BaseServerTestCase):
         self.getMessages(3)
 
         self.sendLine(1, "INVITE bar #chan")
-        if modern:
+        self.assertMessageMatch(
-            self.assertMessageMatch(
+            self.getMessage(1),
-                self.getMessage(1),
+            command=ERR_NOTONCHANNEL,
-                command=ERR_NOTONCHANNEL,
+            params=["foo", "#chan", ANYSTR],
-                params=["foo", "#chan", ANYSTR],
+            fail_msg=f"After “foo” invited “bar” to a channel it is not on "
-                fail_msg=f"After “foo” invited “bar” to a channel it is not on "
+            f"#chan, “foo” should have received "
-                f"#chan, “foo” should have received "
+            f"“ERR_NOTONCHANNEL ({ERR_NOTONCHANNEL}) foo #chan :*” but "
-                f"“ERR_NOTONCHANNEL ({ERR_NOTONCHANNEL}) foo #chan :*” but "
+            f"got this instead: {{msg}}",
-                f"got this instead: {{msg}}",
+        )
-            )
-        else:
-            self.assertMessageMatch(
-                self.getMessage(1),
-                command=ERR_NOTONCHANNEL,
-                params=["#chan", ANYSTR],
-                fail_msg=f"After “foo” invited “bar” to a channel it is not on "
-                f"#chan, “foo” should have received "
-                f"“ERR_NOTONCHANNEL ({ERR_NOTONCHANNEL}) #chan :*” but "
-                f"got this instead: {{msg}}",
-            )
 
         messages = self.getMessages(2)
         self.assertEqual(
@@ -377,14 +331,6 @@ class InviteTestCase(cases.BaseServerTestCase):
             "not in #chan, “bar” received something.",
         )
 
-    @cases.mark_specifications("Modern")
-    def testInviteOnlyFromUsersInChannelModern(self):
-        self._testInviteOnlyFromUsersInChannel(modern=True)
-
-    @cases.mark_specifications("RFC2812", deprecated=True)
-    def testInviteOnlyFromUsersInChannelRfc(self):
-        self._testInviteOnlyFromUsersInChannel(modern=False)
-
     @cases.mark_specifications("Modern")
     def testInviteAlreadyInChannel(self):
         """
@@ -410,3 +356,43 @@ class InviteTestCase(cases.BaseServerTestCase):
             command=ERR_USERONCHANNEL,
             params=["foo", "bar", "#chan", ANYSTR],
         )
+
+    @cases.mark_specifications("Ergo")
+    def testInviteExemptsFromBan(self):
+        # regression test for ergochat/ergo#1876;
+        # INVITE should override a +b ban
+        self.connectClient("alice", name="alice")
+        self.joinChannel("alice", "#alice")
+        self.sendLine("alice", "MODE #alice +b bob!*@*")
+        result = {msg.command for msg in self.getMessages("alice")}
+        self.assertIn("MODE", result)
+
+        self.connectClient("bob", name="bob")
+        self.sendLine("bob", "JOIN #alice")
+        result = {msg.command for msg in self.getMessages("bob")}
+        self.assertIn(ERR_BANNEDFROMCHAN, result)
+        self.assertNotIn("JOIN", result)
+
+        self.sendLine("alice", "INVITE bob #alice")
+        result = {msg.command for msg in self.getMessages("alice")}
+        self.assertIn(RPL_INVITING, result)
+        self.assertNotIn(ERR_USERONCHANNEL, result)
+
+        result = {msg.command for msg in self.getMessages("bob")}
+        self.assertIn("INVITE", result)
+
+        self.sendLine("bob", "JOIN #alice")
+        result = {msg.command for msg in self.getMessages("bob")}
+        self.assertNotIn(ERR_BANNEDFROMCHAN, result)
+        self.assertIn("JOIN", result)
+
+        self.sendLine("alice", "KICK #alice bob")
+        self.getMessages("alice")
+        result = {msg.command for msg in self.getMessages("bob")}
+        self.assertIn("KICK", result)
+
+        # INVITE gets "used up" after one JOIN
+        self.sendLine("bob", "JOIN #alice")
+        result = {msg.command for msg in self.getMessages("bob")}
+        self.assertIn(ERR_BANNEDFROMCHAN, result)
+        self.assertNotIn("JOIN", result)

irctest/server_tests/isupport.py

@@ -4,6 +4,64 @@ from irctest import cases, runner
 
 
 class IsupportTestCase(cases.BaseServerTestCase):
+    @cases.mark_specifications("Modern")
+    @cases.mark_isupport("PREFIX")
+    def testPrefix(self):
+        """https://modern.ircdocs.horse/#prefix-parameter"""
+        self.connectClient("foo")
+
+        if "PREFIX" not in self.server_support:
+            raise runner.NotImplementedByController("PREFIX")
+
+        if self.server_support["PREFIX"] == "":
+            # "The value is OPTIONAL and when it is not specified indicates that no
+            # prefixes are supported."
+            return
+
+        m = re.match(
+            r"\((?P<modes>[a-zA-Z]+)\)(?P<prefixes>\S+)", self.server_support["PREFIX"]
+        )
+        self.assertTrue(
+            m,
+            f"PREFIX={self.server_support['PREFIX']} does not have the expected "
+            f"format.",
+        )
+
+        modes = m.group("modes")
+        prefixes = m.group("prefixes")
+
+        # "There is a one-to-one mapping between prefixes and channel modes."
+        self.assertEqual(
+            len(modes), len(prefixes), "Mismatched length of prefix and channel modes."
+        )
+
+        # "The prefixes in this parameter are in descending order, from the prefix
+        # that gives the most privileges to the prefix that gives the least."
+        self.assertLess(modes.index("o"), modes.index("v"), "'o' is not before 'v'")
+        if "h" in modes:
+            self.assertLess(modes.index("o"), modes.index("h"), "'o' is not before 'h'")
+            self.assertLess(modes.index("h"), modes.index("v"), "'h' is not before 'v'")
+        if "q" in modes:
+            self.assertLess(modes.index("q"), modes.index("o"), "'q' is not before 'o'")
+
+        # Not technically in the spec, but it would be very confusing not to follow
+        # these conventions.
+        mode_to_prefix = dict(zip(modes, prefixes))
+        self.assertEqual(mode_to_prefix["o"], "@", "Prefix char for mode +o is not @")
+        self.assertEqual(mode_to_prefix["v"], "+", "Prefix char for mode +v is not +")
+        if "h" in modes:
+            self.assertEqual(
+                mode_to_prefix["h"], "%", "Prefix char for mode +h is not %"
+            )
+        if "q" in modes:
+            self.assertEqual(
+                mode_to_prefix["q"], "~", "Prefix char for mode +q is not ~"
+            )
+        if "a" in modes:
+            self.assertEqual(
+                mode_to_prefix["a"], "&", "Prefix char for mode +a is not &"
+            )
+
     @cases.mark_specifications("Modern", "ircdocs")
     @cases.mark_isupport("TARGMAX")
     def testTargmax(self):

irctest/server_tests/labeled_responses.py

@@ -10,7 +10,8 @@ import re
 import pytest
 
 from irctest import cases
-from irctest.patma import ANYDICT, AnyOptStr, NotStrRe, RemainingKeys, StrRe
+from irctest.numerics import ERR_UNKNOWNCOMMAND
+from irctest.patma import ANYDICT, ANYOPTSTR, NotStrRe, RemainingKeys, StrRe
 
 
 class LabeledResponsesTestCase(cases.BaseServerTestCase, cases.OptionalityHelper):
@@ -298,7 +299,7 @@ class LabeledResponsesTestCase(cases.BaseServerTestCase, cases.OptionalityHelper
             tags={
                 "+draft/reply": msgid,
                 "+draft/react": "l😃l",
-                RemainingKeys(NotStrRe("label")): AnyOptStr(),
+                RemainingKeys(NotStrRe("label")): ANYOPTSTR,
             },
         )
         self.assertNotIn(
@@ -366,7 +367,7 @@ class LabeledResponsesTestCase(cases.BaseServerTestCase, cases.OptionalityHelper
             tags={
                 "+draft/reply": msgid,
                 "+draft/react": "l😃l",
-                RemainingKeys(NotStrRe("label")): AnyOptStr(),
+                RemainingKeys(NotStrRe("label")): ANYOPTSTR,
             },
             fail_msg="No TAGMSG received by the target after sending one out",
         )
@@ -502,3 +503,19 @@ class LabeledResponsesTestCase(cases.BaseServerTestCase, cases.OptionalityHelper
         ack = ms[0]
 
         self.assertMessageMatch(ack, command="ACK", tags={"label": "98765"})
+
+    @cases.mark_capabilities("labeled-response")
+    def testUnknownCommand(self):
+        self.connectClient(
+            "bar", capabilities=["batch", "labeled-response"], skip_if_cap_nak=True
+        )
+
+        # this command doesn't exist, but the error response should still
+        # be labeled:
+        self.sendLine(1, "@label=deadbeef NONEXISTENT_COMMAND")
+        ms = self.getMessages(1)
+        self.assertEqual(len(ms), 1)
+        unknowncommand = ms[0]
+        self.assertMessageMatch(
+            unknowncommand, command=ERR_UNKNOWNCOMMAND, tags={"label": "deadbeef"}
+        )

irctest/server_tests/list.py

@@ -15,8 +15,8 @@ class ListTestCase(cases.BaseServerTestCase):
         if m.command == "321":
             # skip RPL_LISTSTART
             m = self.getMessage(2)
-        while m.command == "322" and m.params[1] == "&SERVER":
+        # skip local pseudo-channels listed by ngircd and ircu
-            # ngircd adds this pseudo-channel
+        while m.command == "322" and m.params[1].startswith("&"):
             m = self.getMessage(2)
         self.assertNotEqual(
             m.command,
@@ -58,8 +58,8 @@ class ListTestCase(cases.BaseServerTestCase):
             "nor 323 (RPL_LISTEND) but: {msg}",
         )
         m = self.getMessage(2)
-        while m.command == "322" and m.params[1] == "&SERVER":
+        # skip local pseudo-channels listed by ngircd and ircu
-            # ngircd adds this pseudo-channel
+        while m.command == "322" and m.params[1].startswith("&"):
             m = self.getMessage(2)
         self.assertNotEqual(
             m.command,

irctest/server_tests/lusers.py

@@ -14,6 +14,7 @@ from irctest.numerics import (
     RPL_LUSERUNKNOWN,
     RPL_YOUREOPER,
 )
+from irctest.patma import ANYSTR, StrRe
 
 # 3 numbers, delimited by spaces, possibly negative (eek)
 LUSERCLIENT_REGEX = re.compile(r"^.*( [-0-9]* ).*( [-0-9]* ).*( [-0-9]* ).*$")
@@ -50,10 +51,11 @@ class LusersTestCase(cases.BaseServerTestCase):
         self.assertIn(lusers.LocalTotal, (total, None))
         self.assertIn(lusers.LocalMax, (max_, None))
 
-    def getLusers(self, client):
+    def getLusers(self, client, allow_missing_265_266):
         self.sendLine(client, "LUSERS")
         messages = self.getMessages(client)
         by_numeric = dict((msg.command, msg) for msg in messages)
+        self.assertEqual(len(by_numeric), len(messages), "Duplicated numerics")
 
         result = LusersResult()
 
@@ -73,12 +75,31 @@ class LusersTestCase(cases.BaseServerTestCase):
             raise ValueError("corrupt reply for 251 RPL_LUSERCLIENT", luserclient_param)
 
         if RPL_LUSEROP in by_numeric:
+            self.assertMessageMatch(
+                by_numeric[RPL_LUSEROP], params=[client, StrRe("[0-9]+"), ANYSTR]
+            )
             result.Opers = int(by_numeric[RPL_LUSEROP].params[1])
         if RPL_LUSERUNKNOWN in by_numeric:
+            self.assertMessageMatch(
+                by_numeric[RPL_LUSERUNKNOWN], params=[client, StrRe("[0-9]+"), ANYSTR]
+            )
             result.Unregistered = int(by_numeric[RPL_LUSERUNKNOWN].params[1])
         if RPL_LUSERCHANNELS in by_numeric:
+            self.assertMessageMatch(
+                by_numeric[RPL_LUSERCHANNELS], params=[client, StrRe("[0-9]+"), ANYSTR]
+            )
             result.Channels = int(by_numeric[RPL_LUSERCHANNELS].params[1])
 
+        self.assertMessageMatch(by_numeric[RPL_LUSERCLIENT], params=[client, ANYSTR])
+        self.assertMessageMatch(by_numeric[RPL_LUSERME], params=[client, ANYSTR])
+
+        if (
+            allow_missing_265_266
+            and RPL_LOCALUSERS not in by_numeric
+            and RPL_GLOBALUSERS not in by_numeric
+        ):
+            return
+
         # FIXME: RPL_LOCALUSERS and RPL_GLOBALUSERS are only in Modern, not in RFC2812
         localusers = by_numeric[RPL_LOCALUSERS]
         globalusers = by_numeric[RPL_GLOBALUSERS]
@@ -114,23 +135,39 @@ class BasicLusersTestCase(LusersTestCase):
     @cases.mark_specifications("RFC2812")
     def testLusers(self):
         self.connectClient("bar", name="bar")
-        lusers = self.getLusers("bar")
+        self.getLusers("bar", True)
+
+        self.connectClient("qux", name="qux")
+        self.getLusers("qux", True)
+
+        self.sendLine("qux", "QUIT")
+        self.assertDisconnected("qux")
+        self.getLusers("bar", True)
+
+    @cases.mark_specifications("Modern")
+    def testLusersFull(self):
+        self.connectClient("bar", name="bar")
+        lusers = self.getLusers("bar", False)
         self.assertLusersResult(lusers, unregistered=0, total=1, max_=1)
 
         self.connectClient("qux", name="qux")
-        lusers = self.getLusers("qux")
+        lusers = self.getLusers("qux", False)
         self.assertLusersResult(lusers, unregistered=0, total=2, max_=2)
 
         self.sendLine("qux", "QUIT")
         self.assertDisconnected("qux")
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", False)
         self.assertLusersResult(lusers, unregistered=0, total=1, max_=2)
 
 
 class LusersUnregisteredTestCase(LusersTestCase):
     @cases.mark_specifications("RFC2812")
-    def testLusers(self):
+    def testLusersRfc2812(self):
-        self.doLusersTest()
+        self.doLusersTest(True)
+
+    @cases.mark_specifications("Modern")
+    def testLusersFull(self):
+        self.doLusersTest(False)
 
     def _synchronize(self, client_name):
         """Synchronizes using a PING, but accept ERR_NOTREGISTERED as a response."""
@@ -145,34 +182,39 @@ class LusersUnregisteredTestCase(LusersTestCase):
                 "got neither PONG or ERR_NOTREGISTERED"
             )
 
-    def doLusersTest(self):
+    def doLusersTest(self, allow_missing_265_266):
         self.connectClient("bar", name="bar")
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", allow_missing_265_266)
-        self.assertLusersResult(lusers, unregistered=0, total=1, max_=1)
+        if lusers:
+            self.assertLusersResult(lusers, unregistered=0, total=1, max_=1)
 
         self.addClient("qux")
         self.sendLine("qux", "NICK qux")
         self._synchronize("qux")
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", allow_missing_265_266)
-        self.assertLusersResult(lusers, unregistered=1, total=1, max_=1)
+        if lusers:
+            self.assertLusersResult(lusers, unregistered=1, total=1, max_=1)
 
         self.addClient("bat")
         self.sendLine("bat", "NICK bat")
         self._synchronize("bat")
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", allow_missing_265_266)
-        self.assertLusersResult(lusers, unregistered=2, total=1, max_=1)
+        if lusers:
+            self.assertLusersResult(lusers, unregistered=2, total=1, max_=1)
 
         # complete registration on one client
         self.sendLine("qux", "USER u s e r")
         self.getRegistrationMessage("qux")
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", allow_missing_265_266)
-        self.assertLusersResult(lusers, unregistered=1, total=2, max_=2)
+        if lusers:
+            self.assertLusersResult(lusers, unregistered=1, total=2, max_=2)
 
         # QUIT the other without registering
         self.sendLine("bat", "QUIT")
         self.assertDisconnected("bat")
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", allow_missing_265_266)
-        self.assertLusersResult(lusers, unregistered=0, total=2, max_=2)
+        if lusers:
+            self.assertLusersResult(lusers, unregistered=0, total=2, max_=2)
 
 
 class LusersUnregisteredDefaultInvisibleTestCase(LusersUnregisteredTestCase):
@@ -188,8 +230,8 @@ class LusersUnregisteredDefaultInvisibleTestCase(LusersUnregisteredTestCase):
 
     @cases.mark_specifications("Ergo")
     def testLusers(self):
-        self.doLusersTest()
+        self.doLusersTest(False)
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", False)
         self.assertLusersResult(lusers, unregistered=0, total=2, max_=2)
         self.assertEqual(lusers.GlobalInvisible, 2)
         self.assertEqual(lusers.GlobalVisible, 0)
@@ -199,7 +241,7 @@ class LuserOpersTestCase(LusersTestCase):
     @cases.mark_specifications("Ergo")
     def testLuserOpers(self):
         self.connectClient("bar", name="bar")
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", False)
         self.assertLusersResult(lusers, unregistered=0, total=1, max_=1)
         self.assertIn(lusers.Opers, (0, None))
 
@@ -207,7 +249,7 @@ class LuserOpersTestCase(LusersTestCase):
         self.sendLine("bar", "OPER operuser operpassword")
         msgs = self.getMessages("bar")
         self.assertIn(RPL_YOUREOPER, {msg.command for msg in msgs})
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", False)
         self.assertLusersResult(lusers, unregistered=0, total=1, max_=1)
         self.assertEqual(lusers.Opers, 1)
 
@@ -215,7 +257,7 @@ class LuserOpersTestCase(LusersTestCase):
         self.connectClient("qux", name="qux")
         self.sendLine("qux", "OPER operuser operpassword")
         self.getMessages("qux")
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", False)
         self.assertLusersResult(lusers, unregistered=0, total=2, max_=2)
         self.assertEqual(lusers.Opers, 2)
 
@@ -223,14 +265,14 @@ class LuserOpersTestCase(LusersTestCase):
         self.sendLine("bar", "MODE bar -o")
         msgs = self.getMessages("bar")
         self.assertIn("MODE", {msg.command for msg in msgs})
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", False)
         self.assertLusersResult(lusers, unregistered=0, total=2, max_=2)
         self.assertEqual(lusers.Opers, 1)
 
         # remove oper by quit
         self.sendLine("qux", "QUIT")
         self.assertDisconnected("qux")
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", False)
         self.assertLusersResult(lusers, unregistered=0, total=1, max_=2)
         self.assertEqual(lusers.Opers, 0)
 
@@ -247,13 +289,13 @@ class ErgoInvisibleDefaultTestCase(LusersTestCase):
     @cases.mark_specifications("Ergo")
     def testLusers(self):
         self.connectClient("bar", name="bar")
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", False)
         self.assertLusersResult(lusers, unregistered=0, total=1, max_=1)
         self.assertEqual(lusers.GlobalInvisible, 1)
         self.assertEqual(lusers.GlobalVisible, 0)
 
         self.connectClient("qux", name="qux")
-        lusers = self.getLusers("qux")
+        lusers = self.getLusers("qux", False)
         self.assertLusersResult(lusers, unregistered=0, total=2, max_=2)
         self.assertEqual(lusers.GlobalInvisible, 2)
         self.assertEqual(lusers.GlobalVisible, 0)
@@ -261,7 +303,7 @@ class ErgoInvisibleDefaultTestCase(LusersTestCase):
         # remove +i with MODE
         self.sendLine("bar", "MODE bar -i")
         msgs = self.getMessages("bar")
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", False)
         self.assertIn("MODE", {msg.command for msg in msgs})
         self.assertLusersResult(lusers, unregistered=0, total=2, max_=2)
         self.assertEqual(lusers.GlobalInvisible, 1)
@@ -270,7 +312,7 @@ class ErgoInvisibleDefaultTestCase(LusersTestCase):
         # disconnect invisible user
         self.sendLine("qux", "QUIT")
         self.assertDisconnected("qux")
-        lusers = self.getLusers("bar")
+        lusers = self.getLusers("bar", False)
         self.assertLusersResult(lusers, unregistered=0, total=1, max_=2)
         self.assertEqual(lusers.GlobalInvisible, 0)
         self.assertEqual(lusers.GlobalVisible, 1)

irctest/server_tests/messages.py

@@ -3,8 +3,8 @@ Section 3.2 of RFC 2812
 <https://tools.ietf.org/html/rfc2812#section-3.3>
 """
 
-from irctest import cases, runner
+from irctest import cases
-from irctest.numerics import ERR_INPUTTOOLONG, ERR_NOPRIVILEGES, ERR_NOSUCHNICK
+from irctest.numerics import ERR_INPUTTOOLONG
 
 
 class PrivmsgTestCase(cases.BaseServerTestCase):
@@ -34,97 +34,6 @@ class PrivmsgTestCase(cases.BaseServerTestCase):
         self.assertIn(msg.command, ("401", "403", "404"))
 
 
-class PrivmsgServermaskTestCase(cases.BaseServerTestCase):
-    def setUp(self):
-        super().setUp()
-
-        self.connectClient("chk", "chk")
-        self.sendLine("chk", "PRIVMSG $my.little.server :hello there")
-        msg = self.getMessage("chk")
-        if msg.command == ERR_NOSUCHNICK:
-            raise runner.NotImplementedByController("PRIVMSG to server mask")
-
-    @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
-    def testPrivmsgServermask(self):
-        """
-        <https://datatracker.ietf.org/doc/html/rfc1459#section-4.4.1>
-        <https://datatracker.ietf.org/doc/html/rfc2812>
-        <https://github.com/ircdocs/modern-irc/pull/134>
-        """
-        self.connectClient("sender", "sender")
-        self.connectClient("user", "user")
-
-        self.sendLine("sender", "OPER operuser operpassword")
-        self.getMessages("sender")
-
-        self.sendLine("sender", "PRIVMSG $*.server :hello there")
-        self.getMessages("sender")
-        self.assertMessageMatch(
-            self.getMessage("user"),
-            command="PRIVMSG",
-            params=["$*.server", "hello there"],
-        )
-
-    @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
-    def testPrivmsgServermaskNoMatch(self):
-        """
-        <https://datatracker.ietf.org/doc/html/rfc1459#section-4.4.1>
-        <https://datatracker.ietf.org/doc/html/rfc2812>
-        <https://github.com/ircdocs/modern-irc/pull/134>
-        """
-        self.connectClient("sender", "sender")
-        self.connectClient("user", "user")
-
-        self.sendLine("sender", "OPER operuser operpassword")
-        self.getMessages("sender")
-
-        self.sendLine("sender", "PRIVMSG $*.foobar :hello there")
-        messages = self.getMessages("sender")
-        self.assertEqual(len(messages), 0, messages)
-        messages = self.getMessages("user")
-        self.assertEqual(len(messages), 0, messages)
-
-    @cases.mark_specifications("Modern")
-    def testPrivmsgServermaskStar(self):
-        """
-        <https://github.com/ircdocs/modern-irc/pull/134>
-
-        Note: 1459 and 2812 explicitly forbid "$*" as target.
-        """
-        self.connectClient("sender", "sender")
-        self.connectClient("user", "user")
-
-        self.sendLine("sender", "OPER operuser operpassword")
-        self.getMessages("sender")
-
-        self.connectClient("user", "user")
-
-        self.sendLine("sender", "OPER operuser operpassword")
-        self.getMessages("sender")
-
-        self.sendLine("sender", "PRIVMSG $* :hello there")
-        self.getMessages("sender")
-        self.assertMessageMatch(
-            self.getMessage("user"), command="PRIVMSG", params=["$*", "hello there"]
-        )
-
-    @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
-    def testPrivmsgServermaskNotOper(self):
-        """
-        <https://datatracker.ietf.org/doc/html/rfc1459#section-4.4.1>
-        <https://datatracker.ietf.org/doc/html/rfc2812>
-        <https://github.com/ircdocs/modern-irc/pull/134>
-        """
-        self.connectClient("sender", "sender")
-        self.connectClient("user", "user")
-
-        self.sendLine("sender", "PRIVMSG $*.foobar :hello there")
-        self.assertMessageMatch(self.getMessage("sender"), command=ERR_NOPRIVILEGES)
-
-        pms = [msg for msg in self.getMessages("user") if msg.command == "PRIVMSG"]
-        self.assertEqual(len(pms), 0)
-
-
 class NoticeTestCase(cases.BaseServerTestCase):
     @cases.mark_specifications("RFC1459", "RFC2812")
     def testNotice(self):

irctest/server_tests/monitor.py

@@ -188,15 +188,12 @@ class MonitorTestCase(cases.BaseServerTestCase):
         self.sendLine(1, "MONITOR + *!username@127.0.0.1")
         try:
             m = self.getMessage(1)
-            self.assertNotEqual(
+            self.assertMessageMatch(m, command="731")
-                m.command,
-                "731",
-                m,
-                fail_msg="Got 731 (RPL_MONOFFLINE) after adding a monitor "
-                "on a mask: {msg}",
-            )
         except NoMessageException:
             pass
+        else:
+            m = self.getMessage(1)
+            self.assertMessageMatch(m, command="731")
         self.connectClient("bar")
         try:
             m = self.getMessage(1)

irctest/server_tests/who.py

@@ -0,0 +1,479 @@
+import re
+
+import pytest
+
+from irctest import cases, runner
+from irctest.numerics import RPL_ENDOFWHO, RPL_WHOREPLY, RPL_WHOSPCRPL, RPL_YOUREOPER
+from irctest.patma import ANYSTR, InsensitiveStr, StrRe
+
+
+def realname_regexp(realname):
+    return (
+        "[0-9]+ "  # is 0 for every IRCd I can find, except ircu2 (which returns 3)
+        + "(0042 )?"  # for irc2...
+        + re.escape(realname)
+    )
+
+
+class BaseWhoTestCase:
+    def _init(self, auth=False):
+        self.nick = "coolNick"
+        self.username = "myusernam"  # may be truncated if longer than this
+        self.realname = "My UniqueReal Name"
+
+        self.addClient()
+        if auth:
+            self.controller.registerUser(self, "coolAcct", "sesame")
+            self.requestCapabilities(1, ["sasl"], skip_if_cap_nak=True)
+            self.authenticateClient(1, "coolAcct", "sesame")
+        self.sendLine(1, f"NICK {self.nick}")
+        self.sendLine(1, f"USER {self.username} 0 * :{self.realname}")
+        if auth:
+            self.sendLine(1, "CAP END")
+            self.getRegistrationMessage(1)
+        self.skipToWelcome(1)
+        self.sendLine(1, "JOIN #chan")
+
+        self.getMessages(1)
+
+        self.connectClient("otherNick")
+        self.getMessages(2)
+        self.sendLine(2, "JOIN #chan")
+        self.getMessages(2)
+
+    def _checkReply(self, reply, flags):
+        host_re = "[0-9A-Za-z_:.-]+"
+        if reply.params[1] == "*":
+            # Unreal, ...
+            self.assertMessageMatch(
+                reply,
+                command=RPL_WHOREPLY,
+                params=[
+                    "otherNick",
+                    "*",  # no chan
+                    StrRe("~?" + self.username),
+                    StrRe(host_re),
+                    "My.Little.Server",
+                    "coolNick",
+                    flags,
+                    StrRe(realname_regexp(self.realname)),
+                ],
+            )
+        else:
+            # Solanum, Insp, ...
+            self.assertMessageMatch(
+                reply,
+                command=RPL_WHOREPLY,
+                params=[
+                    "otherNick",
+                    "#chan",
+                    StrRe("~?" + self.username),
+                    StrRe(host_re),
+                    "My.Little.Server",
+                    "coolNick",
+                    flags + "@",
+                    StrRe(realname_regexp(self.realname)),
+                ],
+            )
+
+
+class WhoTestCase(BaseWhoTestCase, cases.BaseServerTestCase, cases.OptionalityHelper):
+    @cases.mark_specifications("Modern")
+    def testWhoStar(self):
+        self._init()
+
+        self.sendLine(2, "WHO *")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 3, "Unexpected number of messages")
+
+        (*replies, end) = messages
+
+        # Get them in deterministic order
+        replies.sort(key=lambda msg: msg.params[5])
+
+        self._checkReply(replies[0], "H")
+
+        # " `<mask>` MUST be exactly the `<mask>` parameter sent by the client
+        # in its `WHO` message. This means the case MUST be preserved."
+        # -- https://github.com/ircdocs/modern-irc/pull/138/files
+        self.assertMessageMatch(
+            end,
+            command=RPL_ENDOFWHO,
+            params=["otherNick", "*", ANYSTR],
+        )
+
+    @pytest.mark.parametrize(
+        "mask", ["coolNick", "coolnick", "coolni*"], ids=["exact", "casefolded", "mask"]
+    )
+    @cases.mark_specifications("Modern")
+    def testWhoNick(self, mask):
+        self._init()
+
+        self.sendLine(2, f"WHO {mask}")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 2, "Unexpected number of messages")
+
+        (reply, end) = messages
+
+        self._checkReply(reply, "H")
+
+        # " `<mask>` MUST be exactly the `<mask>` parameter sent by the client
+        # in its `WHO` message. This means the case MUST be preserved."
+        # -- https://github.com/ircdocs/modern-irc/pull/138/files
+        self.assertMessageMatch(
+            end,
+            command=RPL_ENDOFWHO,
+            params=["otherNick", InsensitiveStr(mask), ANYSTR],
+        )
+
+    @pytest.mark.skip("Not consistently implemented")
+    @pytest.mark.parametrize(
+        "mask",
+        ["*usernam", "*UniqueReal*", "127.0.0.1"],
+        ids=["username", "realname-mask", "hostname"],
+    )
+    def testWhoUsernameRealName(self, mask):
+        self._init()
+
+        self.sendLine(2, f"WHO :{mask}")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 2, "Unexpected number of messages")
+
+        (reply, end) = messages
+
+        self._checkReply(reply, "H")
+
+        # " `<mask>` MUST be exactly the `<mask>` parameter sent by the client
+        # in its `WHO` message. This means the case MUST be preserved."
+        # -- https://github.com/ircdocs/modern-irc/pull/138/files
+        self.assertMessageMatch(
+            end,
+            command=RPL_ENDOFWHO,
+            params=["otherNick", InsensitiveStr(mask), ANYSTR],
+        )
+
+    @pytest.mark.skip("Not consistently implemented")
+    def testWhoRealNameSpaces(self):
+        self._init()
+
+        self.sendLine(2, "WHO :*UniqueReal Name")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 2, "Unexpected number of messages")
+
+        (reply, end) = messages
+
+        self._checkReply(reply, "H")
+
+        # What to do here? This?
+        # self.assertMessageMatch(
+        #     end,
+        #     command=RPL_ENDOFWHO,
+        #     params=[
+        #         "otherNick",
+        #         InsensitiveStr("*UniqueReal"),
+        #         InsensitiveStr("Name"),
+        #         ANYSTR,
+        #     ],
+        # )
+
+    @pytest.mark.parametrize(
+        "mask", ["coolNick", "coolnick", "coolni*"], ids=["exact", "casefolded", "mask"]
+    )
+    @cases.mark_specifications("Modern")
+    def testWhoNickAway(self, mask):
+        self._init()
+
+        self.sendLine(1, "AWAY :be right back")
+        self.getMessages(1)
+        self.getMessages(2)
+
+        self.sendLine(2, f"WHO {mask}")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 2, "Unexpected number of messages")
+
+        (reply, end) = messages
+
+        self._checkReply(reply, "G")
+
+        self.assertMessageMatch(
+            end,
+            command=RPL_ENDOFWHO,
+            params=["otherNick", InsensitiveStr(mask), ANYSTR],
+        )
+
+    @pytest.mark.parametrize(
+        "mask", ["coolNick", "coolnick", "coolni*"], ids=["exact", "casefolded", "mask"]
+    )
+    @cases.mark_specifications("Modern")
+    def testWhoNickOper(self, 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.getMessages(2)
+
+        self.sendLine(2, f"WHO {mask}")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 2, "Unexpected number of messages")
+
+        (reply, end) = messages
+
+        self._checkReply(reply, "H*")
+
+        self.assertMessageMatch(
+            end,
+            command=RPL_ENDOFWHO,
+            params=["otherNick", InsensitiveStr(mask), ANYSTR],
+        )
+
+    @pytest.mark.parametrize(
+        "mask", ["coolNick", "coolnick", "coolni*"], ids=["exact", "casefolded", "mask"]
+    )
+    @cases.mark_specifications("Modern")
+    def testWhoNickAwayAndOper(self, 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)
+
+        self.sendLine(2, f"WHO {mask}")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 2, "Unexpected number of messages")
+
+        (reply, end) = messages
+
+        self._checkReply(reply, "G*")
+
+        self.assertMessageMatch(
+            end,
+            command=RPL_ENDOFWHO,
+            params=["otherNick", InsensitiveStr(mask), ANYSTR],
+        )
+
+    @pytest.mark.parametrize("mask", ["#chan", "#CHAN"], ids=["exact", "casefolded"])
+    @cases.mark_specifications("Modern")
+    def testWhoChan(self, 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)
+
+        self.sendLine(2, f"WHO {mask}")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 3, "Unexpected number of messages")
+
+        (*replies, end) = messages
+
+        # Get them in deterministic order
+        replies.sort(key=lambda msg: msg.params[5])
+
+        host_re = "[0-9A-Za-z_:.-]+"
+        self.assertMessageMatch(
+            replies[0],
+            command=RPL_WHOREPLY,
+            params=[
+                "otherNick",
+                "#chan",
+                StrRe("~?" + self.username),
+                StrRe(host_re),
+                "My.Little.Server",
+                "coolNick",
+                "G*@",
+                StrRe(realname_regexp(self.realname)),
+            ],
+        )
+
+        self.assertMessageMatch(
+            replies[1],
+            command=RPL_WHOREPLY,
+            params=[
+                "otherNick",
+                "#chan",
+                ANYSTR,
+                ANYSTR,
+                "My.Little.Server",
+                "otherNick",
+                "H",
+                StrRe("[0-9]+ .*"),
+            ],
+        )
+
+        self.assertMessageMatch(
+            end,
+            command=RPL_ENDOFWHO,
+            params=["otherNick", InsensitiveStr(mask), ANYSTR],
+        )
+
+    @cases.mark_specifications("IRCv3")
+    @cases.mark_isupport("WHOX")
+    def testWhoxFull(self):
+        """https://github.com/ircv3/ircv3-specifications/pull/482"""
+        self._testWhoxFull("%tcuihsnfdlaor,123")
+
+    @cases.mark_specifications("IRCv3")
+    @cases.mark_isupport("WHOX")
+    def testWhoxFullReversed(self):
+        """https://github.com/ircv3/ircv3-specifications/pull/482"""
+        self._testWhoxFull("%" + "".join(reversed("tcuihsnfdlaor")) + ",123")
+
+    def _testWhoxFull(self, chars):
+        self._init()
+        if "WHOX" not in self.server_support:
+            raise runner.IsupportTokenNotSupported("WHOX")
+
+        self.sendLine(2, f"WHO coolNick {chars}")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 2, "Unexpected number of messages")
+
+        (reply, end) = messages
+
+        self.assertMessageMatch(
+            reply,
+            command=RPL_WHOSPCRPL,
+            params=[
+                "otherNick",
+                "123",
+                StrRe(r"(#chan|\*)"),
+                StrRe("~?myusernam"),
+                ANYSTR,
+                ANYSTR,
+                "My.Little.Server",
+                "coolNick",
+                StrRe("H@?"),
+                ANYSTR,  # hopcount
+                StrRe("[0-9]"),  # seconds idle
+                "0",  # account name
+                ANYSTR,  # op level
+                "My UniqueReal Name",
+            ],
+        )
+
+        self.assertMessageMatch(
+            end,
+            command=RPL_ENDOFWHO,
+            params=["otherNick", InsensitiveStr("coolNick"), ANYSTR],
+        )
+
+    def testWhoxToken(self):
+        """https://github.com/ircv3/ircv3-specifications/pull/482"""
+        self._init()
+        if "WHOX" not in self.server_support:
+            raise runner.IsupportTokenNotSupported("WHOX")
+
+        self.sendLine(2, "WHO coolNick %tn,321")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 2, "Unexpected number of messages")
+
+        (reply, end) = messages
+
+        self.assertMessageMatch(
+            reply,
+            command=RPL_WHOSPCRPL,
+            params=[
+                "otherNick",
+                "321",
+                "coolNick",
+            ],
+        )
+
+        self.assertMessageMatch(
+            end,
+            command=RPL_ENDOFWHO,
+            params=["otherNick", InsensitiveStr("coolNick"), ANYSTR],
+        )
+
+
+@cases.mark_services
+class WhoServicesTestCase(
+    BaseWhoTestCase, cases.BaseServerTestCase, cases.OptionalityHelper
+):
+    @cases.mark_specifications("IRCv3")
+    @cases.mark_isupport("WHOX")
+    def testWhoxAccount(self):
+        self._init(auth=True)
+        if "WHOX" not in self.server_support:
+            raise runner.IsupportTokenNotSupported("WHOX")
+
+        self.sendLine(2, "WHO coolNick %na")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 2, "Unexpected number of messages")
+
+        (reply, end) = messages
+
+        self.assertMessageMatch(
+            reply,
+            command=RPL_WHOSPCRPL,
+            params=[
+                "otherNick",
+                "coolNick",
+                "coolAcct",
+            ],
+        )
+
+        self.assertMessageMatch(
+            end,
+            command=RPL_ENDOFWHO,
+            params=["otherNick", InsensitiveStr("coolNick"), ANYSTR],
+        )
+
+    @cases.mark_specifications("IRCv3")
+    @cases.mark_isupport("WHOX")
+    def testWhoxNoAccount(self):
+        self._init(auth=False)
+        if "WHOX" not in self.server_support:
+            raise runner.IsupportTokenNotSupported("WHOX")
+
+        self.sendLine(2, "WHO coolNick %na")
+        messages = self.getMessages(2)
+
+        self.assertEqual(len(messages), 2, "Unexpected number of messages")
+
+        (reply, end) = messages
+
+        self.assertMessageMatch(
+            reply,
+            command=RPL_WHOSPCRPL,
+            params=[
+                "otherNick",
+                "coolNick",
+                "0",
+            ],
+        )
+
+        self.assertMessageMatch(
+            end,
+            command=RPL_ENDOFWHO,
+            params=["otherNick", InsensitiveStr("coolNick"), ANYSTR],
+        )

irctest/server_tests/whois.py

@@ -199,8 +199,8 @@ class WhoisTestCase(_WhoisTestMixin, cases.BaseServerTestCase, cases.Optionality
     def testWhoisNumerics(self, away, oper):
         """Tests all numerics are in the exhaustive list defined in the Modern spec.
 
-        TBD modern PR"""
+        <https://modern.ircdocs.horse/#whois-message>"""
-        self._testWhoisNumerics(authenticate=False, away=away, oper=oper)
+        self._testWhoisNumerics(oper=oper, authenticate=False, away=away)
 
 
 @cases.mark_services
@@ -214,7 +214,7 @@ class ServicesWhoisTestCase(
         """Tests all numerics are in the exhaustive list defined in the Modern spec,
         on an authenticated user.
 
-        TBD modern PR"""
+        <https://modern.ircdocs.horse/#whois-message>"""
         self._testWhoisNumerics(oper=oper, authenticate=True, away=False)
 
     @cases.mark_specifications("Ergo")

irctest/server_tests/whowas.py

@@ -0,0 +1,347 @@
+import pytest
+
+from irctest import cases, runner
+from irctest.exceptions import ConnectionClosed
+from irctest.numerics import (
+    ERR_NONICKNAMEGIVEN,
+    ERR_WASNOSUCHNICK,
+    RPL_ENDOFWHOWAS,
+    RPL_WHOISACTUALLY,
+    RPL_WHOISSERVER,
+    RPL_WHOWASUSER,
+)
+from irctest.patma import ANYSTR, StrRe
+
+
+class WhowasTestCase(cases.BaseServerTestCase):
+    @cases.mark_specifications("RFC1459", "RFC2812")
+    def testWhowasNumerics(self):
+        """
+        https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
+        https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
+        """
+        self.connectClient("nick1")
+
+        self.connectClient("nick2")
+        self.sendLine(2, "QUIT :bye")
+        try:
+            self.getMessages(2)
+        except ConnectionClosed:
+            pass
+
+        self.sendLine(1, "WHOWAS nick2")
+
+        messages = []
+        for _ in range(10):
+            messages.extend(self.getMessages(1))
+            if RPL_ENDOFWHOWAS in (m.command for m in messages):
+                break
+
+        last_message = messages.pop()
+
+        self.assertMessageMatch(
+            last_message,
+            command=RPL_ENDOFWHOWAS,
+            params=["nick1", "nick2", ANYSTR],
+            fail_msg=f"Last message was not RPL_ENDOFWHOWAS ({RPL_ENDOFWHOWAS})",
+        )
+
+        unexpected_messages = []
+
+        # Straight from the RFCs
+        for m in messages:
+            if m.command == RPL_WHOWASUSER:
+                host_re = "[0-9A-Za-z_:.-]+"
+                self.assertMessageMatch(
+                    m,
+                    params=[
+                        "nick1",
+                        "nick2",
+                        StrRe("~?username"),
+                        StrRe(host_re),
+                        "*",
+                        "Realname",
+                    ],
+                )
+            elif m.command == RPL_WHOISSERVER:
+                self.assertMessageMatch(
+                    m, params=["nick1", "nick2", "My.Little.Server", ANYSTR]
+                )
+            elif m.command == RPL_WHOISACTUALLY:
+                # Technically not allowed by the RFCs, but Solanum uses it.
+                # Not checking the syntax here; WhoisTestCase does it.
+                pass
+            else:
+                unexpected_messages.append(m)
+
+        self.assertEqual(
+            unexpected_messages, [], fail_msg="Unexpected numeric messages: {got}"
+        )
+
+    def _testWhowasMultiple(self, second_result, whowas_command):
+        """
+        "The history is searched backward, returning the most recent entry first."
+        -- https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
+        -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
+        """
+        # TODO: this test assumes the order is always: RPL_WHOWASUSER, then
+        # optional RPL_WHOISACTUALLY, then RPL_WHOISSERVER; but the RFCs
+        # don't specify the order.
+        self.connectClient("nick1")
+
+        self.connectClient("nick2", ident="ident2")
+        self.sendLine(2, "QUIT :bye")
+        try:
+            self.getMessages(2)
+        except ConnectionClosed:
+            pass
+
+        self.connectClient("nick2", ident="ident3")
+        self.sendLine(3, "QUIT :bye")
+        try:
+            self.getMessages(3)
+        except ConnectionClosed:
+            pass
+
+        self.sendLine(1, whowas_command)
+
+        messages = self.getMessages(1)
+
+        # nick2 with ident3
+        self.assertMessageMatch(
+            messages.pop(0),
+            command=RPL_WHOWASUSER,
+            params=[
+                "nick1",
+                "nick2",
+                StrRe("~?ident3"),
+                ANYSTR,
+                "*",
+                "Realname",
+            ],
+        )
+        while messages[0].command in (RPL_WHOISACTUALLY, RPL_WHOISSERVER):
+            # don't care
+            messages.pop(0)
+
+        if second_result:
+            # nick2 with ident2
+            self.assertMessageMatch(
+                messages.pop(0),
+                command=RPL_WHOWASUSER,
+                params=[
+                    "nick1",
+                    "nick2",
+                    StrRe("~?ident2"),
+                    ANYSTR,
+                    "*",
+                    "Realname",
+                ],
+            )
+            if messages[0].command == RPL_WHOISACTUALLY:
+                # don't care
+                messages.pop(0)
+            while messages[0].command in (RPL_WHOISACTUALLY, RPL_WHOISSERVER):
+                # don't care
+                messages.pop(0)
+
+        self.assertMessageMatch(
+            messages.pop(0),
+            command=RPL_ENDOFWHOWAS,
+            params=["nick1", "nick2", ANYSTR],
+            fail_msg=f"Last message was not RPL_ENDOFWHOWAS ({RPL_ENDOFWHOWAS})",
+        )
+
+    @cases.mark_specifications("RFC1459", "RFC2812")
+    def testWhowasMultiple(self):
+        """
+        "The history is searched backward, returning the most recent entry first."
+        -- https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
+        -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
+        """
+        self._testWhowasMultiple(second_result=True, whowas_command="WHOWAS nick2")
+
+    @cases.mark_specifications("RFC1459", "RFC2812")
+    def testWhowasCount1(self):
+        """
+        "If there are multiple entries, up to <count> replies will be returned"
+        -- https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
+        -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
+        """
+        self._testWhowasMultiple(second_result=False, whowas_command="WHOWAS nick2 1")
+
+    @cases.mark_specifications("RFC1459", "RFC2812")
+    def testWhowasCount2(self):
+        """
+        "If there are multiple entries, up to <count> replies will be returned"
+        -- https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
+        -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
+        """
+        self._testWhowasMultiple(second_result=True, whowas_command="WHOWAS nick2 2")
+
+    @cases.mark_specifications("RFC1459", "RFC2812")
+    def testWhowasCountNegative(self):
+        """
+        "If a non-positive number is passed as being <count>, then a full search
+        is done."
+        -- https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
+        -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
+        """
+        self._testWhowasMultiple(second_result=True, whowas_command="WHOWAS nick2 -1")
+
+    @cases.mark_specifications("RFC1459", "RFC2812")
+    def testWhowasCountZero(self):
+        """
+        "If a non-positive number is passed as being <count>, then a full search
+        is done."
+        -- https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
+        -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
+        """
+        self._testWhowasMultiple(second_result=True, whowas_command="WHOWAS nick2 0")
+
+    @cases.mark_specifications("RFC2812", deprecated=True)
+    def testWhowasWildcard(self):
+        """
+        "Wildcards are allowed in the <target> parameter."
+        -- https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
+        """
+        self._testWhowasMultiple(second_result=True, whowas_command="WHOWAS *ck2")
+
+    @cases.mark_specifications("RFC1459", "RFC2812", deprecated=True)
+    def testWhowasNoParam(self):
+        """
+        https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
+        https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
+
+        and:
+
+        "At the end of all reply batches, there must be RPL_ENDOFWHOWAS
+        (even if there was only one reply and it was an error)."
+        -- https://datatracker.ietf.org/doc/html/rfc1459#page-50
+        -- https://datatracker.ietf.org/doc/html/rfc2812#page-45
+        """
+        # But no one seems to follow this. Most implementations use ERR_NEEDMOREPARAMS
+        # instead of ERR_NONICKNAMEGIVEN; and I couldn't find any that returns
+        # RPL_ENDOFWHOWAS either way.
+        self.connectClient("nick1")
+
+        self.sendLine(1, "WHOWAS")
+
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command=ERR_NONICKNAMEGIVEN,
+            params=["nick1", ANYSTR],
+        )
+
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command=RPL_ENDOFWHOWAS,
+            params=["nick1", "nick2", ANYSTR],
+        )
+
+    @cases.mark_specifications("RFC1459", "RFC2812")
+    def testWhowasNoSuchNick(self):
+        """
+        https://datatracker.ietf.org/doc/html/rfc1459#section-4.5.3
+        https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
+
+        and:
+
+        "At the end of all reply batches, there must be RPL_ENDOFWHOWAS
+        (even if there was only one reply and it was an error)."
+        -- https://datatracker.ietf.org/doc/html/rfc1459#page-50
+        -- https://datatracker.ietf.org/doc/html/rfc2812#page-45
+        """
+        self.connectClient("nick1")
+
+        self.sendLine(1, "WHOWAS nick2")
+
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command=ERR_WASNOSUCHNICK,
+            params=["nick1", "nick2", ANYSTR],
+        )
+
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command=RPL_ENDOFWHOWAS,
+            params=["nick1", "nick2", ANYSTR],
+        )
+
+    @cases.mark_specifications("RFC2812")
+    @cases.mark_isupport("TARGMAX")
+    @pytest.mark.parametrize("targets", ["nick2,nick3", "nick3,nick2"])
+    def testWhowasMultiTarget(self, targets):
+        """
+        https://datatracker.ietf.org/doc/html/rfc2812#section-3.6.3
+        """
+        self.connectClient("nick1")
+
+        targmax = dict(
+            item.split(":", 1)
+            for item in self.server_support.get("TARGMAX", "").split(",")
+            if item
+        )
+        if targmax.get("WHOWAS", "1") == "1":
+            raise runner.NotImplementedByController("Multi-target WHOWAS")
+
+        self.connectClient("nick2", ident="ident2")
+        self.sendLine(2, "QUIT :bye")
+        try:
+            self.getMessages(2)
+        except ConnectionClosed:
+            pass
+
+        self.connectClient("nick3", ident="ident3")
+        self.sendLine(3, "QUIT :bye")
+        try:
+            self.getMessages(3)
+        except ConnectionClosed:
+            pass
+
+        self.sendLine(1, f"WHOWAS {targets}")
+
+        messages = self.getMessages(1)
+
+        self.assertMessageMatch(
+            messages.pop(0),
+            command=RPL_WHOWASUSER,
+            params=[
+                "nick1",
+                "nick3",
+                StrRe("~?ident3"),
+                ANYSTR,
+                "*",
+                "Realname",
+            ],
+        )
+        while messages[0].command in (RPL_WHOISACTUALLY, RPL_WHOISSERVER):
+            # don't care
+            messages.pop(0)
+
+        # nick2 with ident2
+        self.assertMessageMatch(
+            messages.pop(0),
+            command=RPL_WHOWASUSER,
+            params=[
+                "nick1",
+                "nick2",
+                StrRe("~?ident2"),
+                ANYSTR,
+                "*",
+                "Realname",
+            ],
+        )
+        if messages[0].command == RPL_WHOISACTUALLY:
+            # don't care
+            messages.pop(0)
+        while messages[0].command in (RPL_WHOISACTUALLY, RPL_WHOISSERVER):
+            # don't care
+            messages.pop(0)
+
+        self.assertMessageMatch(
+            messages.pop(0),
+            command=RPL_ENDOFWHOWAS,
+            params=["nick1", targets, ANYSTR],
+            fail_msg=f"Last message was not RPL_ENDOFWHOWAS ({RPL_ENDOFWHOWAS})",
+        )

irctest/specifications.py

@@ -50,9 +50,11 @@ class Capabilities(enum.Enum):
 @enum.unique
 class IsupportTokens(enum.Enum):
     BOT = "BOT"
+    PREFIX = "PREFIX"
     MONITOR = "MONITOR"
     STATUSMSG = "STATUSMSG"
     TARGMAX = "TARGMAX"
+    WHOX = "WHOX"
 
     @classmethod
     def from_name(cls, name: str) -> IsupportTokens:

patches/ngircd_whowas_delay.patch

@@ -0,0 +1,19 @@
+ngIRCd skips WHOWAS entries for users that were connected for less
+than 30 seconds.
+
+To avoid waiting 30s in every WHOWAS test, we need to remove this.
+
+diff --git a/src/ngircd/client.c b/src/ngircd/client.c
+index 67c02604..66e8e540 100644
+--- a/src/ngircd/client.c
++++ b/src/ngircd/client.c
+@@ -1490,9 +1490,6 @@ Client_RegisterWhowas( CLIENT *Client )
+		return;
+ 
+	now = time(NULL);
+-	/* Don't register clients that were connected less than 30 seconds. */
+-	if( now - Client->starttime < 30 )
+-		return;
+ 
+	slot = Last_Whowas + 1;
+	if( slot >= MAX_WHOWAS || slot < 0 ) slot = 0;

pyproject.toml

@@ -1,5 +1,6 @@
 [tool.black]
 target-version = ['py37']
+exclude = 'irctest/scram/*'
 
 [tool.isort]
 multi_line_output = 3

pytest.ini

@@ -33,7 +33,9 @@ markers =
     # isupport tokens
     BOT
     MONITOR
+    PREFIX
     STATUSMSG
     TARGMAX
+    WHOX
 
 python_classes = *TestCase Test*

workflows.yml

@@ -27,7 +27,7 @@ software:
         name: Hybrid
         repository: ircd-hybrid/ircd-hybrid
         refs:
-            stable: "8.2.38"
+            stable: "8.2.39"
             release: null
             devel: "8.2.x"
             devel_release: null
@@ -47,8 +47,8 @@ software:
             stable:
                 - name: clone
                   run: |-
-                      curl https://gitlab.com/rizon/plexus4/-/archive/403a967e3677a2a8420b504f451e7557259e0790/plexus4-403a967e3677a2a8420b504f451e7557259e0790.tar.gz | tar -zx
+                      curl https://gitlab.com/rizon/plexus4/-/archive/20211115_0-611/plexus4-20211115_0-611.tar | tar -x
-                      mv plexus4* plexus4
+                      mv plexus* plexus4
                 - name: build
                   run: |-
                       cd $GITHUB_WORKSPACE/plexus4
@@ -77,7 +77,7 @@ software:
         refs:
             # Actually Solanum doesn't have releases; so we just bump this
             # commit hash from time to time
-            stable: e370888264da666a1bd9faac86cd5f2aa06084f4
+            stable: 492d560ee13e71dc35403fd676e58c2d5bdcf2a9
             release: null
             devel: main
             devel_release: null
@@ -96,7 +96,7 @@ software:
         name: Bahamut
         repository: DALnet/Bahamut
         refs:
-            stable: "v2.2.0"
+            stable: "v2.2.1"
             release: null
             devel: "master"
             devel_release: null
@@ -104,7 +104,7 @@ software:
         separate_build_job: true
         build_script: |
             cd $GITHUB_WORKSPACE/Bahamut/
-            patch src/s_user.c < $GITHUB_WORKSPACE/bahamut_localhost.patch
+            patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch
             echo "#undef THROTTLE_ENABLE" >> include/config.h
             libtoolize --force
             aclocal
@@ -130,7 +130,7 @@ software:
         pre_deps:
             - uses: actions/setup-go@v2
               with:
-                  go-version: '~1.16'
+                  go-version: '^1.18.0'
             - run: go version
         separate_build_job: false
         build_script: |
@@ -142,7 +142,7 @@ software:
         name: InspIRCd
         repository: inspircd/inspircd
         refs: &inspircd_refs
-            stable: v3.10.0
+            stable: v3.12.0
             release: null
             devel: master
             devel_release: insp3
@@ -152,7 +152,7 @@ software:
         separate_build_job: true
         build_script: &inspircd_build_script |
             cd $GITHUB_WORKSPACE/inspircd/
-            patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch
+            patch src/inspircd.cpp < $GITHUB_WORKSPACE/patches/inspircd_mainloop.patch
             ./configure --prefix=$HOME/.local/inspircd --development
             make -j 4
             make install
@@ -217,6 +217,7 @@ software:
         separate_build_job: true
         build_script: |
             cd $GITHUB_WORKSPACE/ngircd
+            patch src/ngircd/client.c < $GITHUB_WORKSPACE/patches/ngircd_whowas_delay.patch
             ./autogen.sh
             ./configure --prefix=$HOME/.local/
             make -j 4
@@ -246,12 +247,12 @@ software:
             make install
 
     unrealircd:
-        name: UnrealIRCd
+        name: UnrealIRCd 6
         repository: unrealircd/unrealircd
-        refs: &unrealircd_refs
+        refs:
-            stable: 94993a03ca8d3c193c0295c33af39270c3f9d27d  # 5.2.1-rc1
+            stable: daa0c11f285c7123ba9fa2966dee2d1a17729f1e  # 6.0.2 + a few commits
-            release: null
+            release: 29fd2e772a6b4b9107daa4e3c237df454b055810  # 6.0.2
-            devel: unreal52
+            devel: unreal60_dev
             devel_release: null
         path: unrealircd
         prefix: ~/.local/unrealircd
@@ -267,6 +268,19 @@ software:
             make -j 4
             make install
 
+    unrealircd-5:
+        name: UnrealIRCd 5
+        repository: unrealircd/unrealircd
+        refs:
+            stable: 6604856973f713a494f83d38992d7d61ce6b9db4  # 5.2.4
+            release: null
+            devel: unreal52
+            devel_release:
+        path: unrealircd
+        prefix: ~/.local/unrealircd
+        separate_build_job: true
+        build_script: *unrealircd_build_script
+
     #############################
     # Clients:
 
@@ -276,7 +290,7 @@ software:
         install_steps:
             stable:
                 - name: Install dependencies
-                  run: pip install limnoria==2021.06.15 cryptography pyxmpp2-scram
+                  run: pip install limnoria==2022.03.17 cryptography pyxmpp2-scram
             release:
                 - name: Install dependencies
                   run: pip install limnoria cryptography pyxmpp2-scram
@@ -291,7 +305,7 @@ software:
         install_steps:
             stable:
                 - name: Install dependencies
-                  run: pip install sopel==7.1.1
+                  run: pip install sopel==7.1.8
             release:
                 - name: Install dependencies
                   run: pip install sopel
@@ -314,7 +328,7 @@ tests:
         software: [charybdis]
 
     hybrid:
-        software: [hybrid]
+        software: [hybrid, anope]
 
     solanum:
         software: [solanum]
@@ -354,6 +368,9 @@ tests:
     ircu2:
         software: [ircu2]
 
+    unrealircd-5:
+        software: [unrealircd-5]
+
     unrealircd:
         software: [unrealircd]