val/irctest
1
0
Fork 0
mirror of https://github.com/progval/irctest.git synced 2025-04-06 07:19:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ngircd controller

Browse Source
This commit is contained in:
Valentin Lorentz
2021-09-05 17:16:13 +02:00
committed by Val Lorentz
parent 50b253fda8
commit 3630a25c11
14 changed files with 509 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
.github/workflows/test-devel.yml vendored
View File

@ -156,6 +156,46 @@ jobs:
name: installed-inspircd name: installed-inspircd
path: ~/artefacts-*.tar.gz path: ~/artefacts-*.tar.gz
retention-days: 1 retention-days: 1
build-ngircd:
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 }}-ngircd-devel
path: '~/.cache
${ github.workspace }/ngircd
'
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Checkout ngircd
uses: actions/checkout@v2
with:
path: ngircd
ref: master
repository: ngircd/ngircd
- name: Build ngircd
run: |
cd $GITHUB_WORKSPACE/ngircd
./autogen.sh
./configure --prefix=$HOME/.local/
make -j 4
make install
- name: Make artefact tarball
run: cd ~; tar -czf artefacts-ngircd.tar.gz .local/ go/
- name: Upload build artefacts
uses: actions/upload-artifact@v2
with:
name: installed-ngircd
path: ~/artefacts-*.tar.gz
retention-days: 1
build-plexus4: build-plexus4:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@ -295,6 +335,9 @@ jobs:
- test-inspircd-anope - test-inspircd-anope
- test-ircu2 - test-ircu2
- test-limnoria - test-limnoria
- test-ngircd
- test-ngircd-anope
- test-ngircd-atheme
- test-plexus4 - test-plexus4
- test-solanum - test-solanum
- test-sopel - test-sopel
@ -444,7 +487,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/go/bin:$PATH run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/go/sbin:~/go/bin:$PATH
make ergo make ergo
- if: always() - if: always()
name: Publish results name: Publish results
@ -508,7 +551,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/bin:$PATH run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH
make inspircd make inspircd
- if: always() - if: always()
name: Publish results name: Publish results
@ -546,7 +589,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/bin:$PATH make run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH make
inspircd-anope inspircd-anope
- if: always() - if: always()
name: Publish results name: Publish results
@ -619,6 +662,108 @@ jobs:
with: with:
name: pytest results limnoria (devel) name: pytest results limnoria (devel)
path: pytest.xml path: pytest.xml
test-ngircd:
needs:
- build-ngircd
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-ngircd
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//sbin:~/.local//bin:$PATH
make ngircd
- if: always()
name: Publish results
uses: actions/upload-artifact@v2
with:
name: pytest results ngircd (devel)
path: pytest.xml
test-ngircd-anope:
needs:
- build-ngircd
- build-anope
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-ngircd
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
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//sbin:~/.local//bin:$PATH make
ngircd-anope
- if: always()
name: Publish results
uses: actions/upload-artifact@v2
with:
name: pytest results ngircd-anope (devel)
path: pytest.xml
test-ngircd-atheme:
needs:
- build-ngircd
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-ngircd
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//sbin:~/.local//bin:$PATH
make ngircd-atheme
- if: always()
name: Publish results
uses: actions/upload-artifact@v2
with:
name: pytest results ngircd-atheme (devel)
path: pytest.xml
test-plexus4: test-plexus4:
needs: needs:
- build-plexus4 - build-plexus4
@ -739,7 +884,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/bin:$PATH run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
make unrealircd make unrealircd
- if: always() - if: always()
name: Publish results name: Publish results
@ -777,7 +922,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/bin:$PATH make run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH make
unrealircd-anope unrealircd-anope
- if: always() - if: always()
name: Publish results name: Publish results
@ -809,7 +954,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/bin:$PATH run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
make unrealircd-atheme make unrealircd-atheme
- if: always() - if: always()
name: Publish results name: Publish results

6
.github/workflows/test-devel_release.yml vendored
View File

@ -110,7 +110,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/bin:$PATH run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH
make inspircd make inspircd
- if: always() - if: always()
name: Publish results name: Publish results
@ -148,7 +148,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/bin:$PATH make run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH make
inspircd-anope inspircd-anope
- if: always() - if: always()
name: Publish results name: Publish results
@ -180,7 +180,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/bin:$PATH run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH
make inspircd-atheme make inspircd-atheme
- if: always() - if: always()
name: Publish results name: Publish results

159
.github/workflows/test-stable.yml vendored
View File

@ -196,6 +196,46 @@ jobs:
name: installed-inspircd name: installed-inspircd
path: ~/artefacts-*.tar.gz path: ~/artefacts-*.tar.gz
retention-days: 1 retention-days: 1
build-ngircd:
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 }}-ngircd-stable
path: '~/.cache
${ github.workspace }/ngircd
'
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Checkout ngircd
uses: actions/checkout@v2
with:
path: ngircd
ref: rel-26.1
repository: ngircd/ngircd
- name: Build ngircd
run: |
cd $GITHUB_WORKSPACE/ngircd
./autogen.sh
./configure --prefix=$HOME/.local/
make -j 4
make install
- name: Make artefact tarball
run: cd ~; tar -czf artefacts-ngircd.tar.gz .local/ go/
- name: Upload build artefacts
uses: actions/upload-artifact@v2
with:
name: installed-ngircd
path: ~/artefacts-*.tar.gz
retention-days: 1
build-plexus4: build-plexus4:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@ -338,6 +378,9 @@ jobs:
- test-irc2 - test-irc2
- test-ircu2 - test-ircu2
- test-limnoria - test-limnoria
- test-ngircd
- test-ngircd-anope
- test-ngircd-atheme
- test-plexus4 - test-plexus4
- test-solanum - test-solanum
- test-sopel - test-sopel
@ -519,7 +562,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/go/bin:$PATH run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/go/sbin:~/go/bin:$PATH
make ergo make ergo
- if: always() - if: always()
name: Publish results name: Publish results
@ -583,7 +626,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/bin:$PATH run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH
make inspircd make inspircd
- if: always() - if: always()
name: Publish results name: Publish results
@ -621,7 +664,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/bin:$PATH make run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH make
inspircd-anope inspircd-anope
- if: always() - if: always()
name: Publish results name: Publish results
@ -653,7 +696,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/bin:$PATH run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:$PATH
make inspircd-atheme make inspircd-atheme
- if: always() - if: always()
name: Publish results name: Publish results
@ -779,6 +822,108 @@ jobs:
with: with:
name: pytest results limnoria (stable) name: pytest results limnoria (stable)
path: pytest.xml path: pytest.xml
test-ngircd:
needs:
- build-ngircd
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-ngircd
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//sbin:~/.local//bin:$PATH
make ngircd
- if: always()
name: Publish results
uses: actions/upload-artifact@v2
with:
name: pytest results ngircd (stable)
path: pytest.xml
test-ngircd-anope:
needs:
- build-ngircd
- build-anope
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-ngircd
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
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//sbin:~/.local//bin:$PATH make
ngircd-anope
- if: always()
name: Publish results
uses: actions/upload-artifact@v2
with:
name: pytest results ngircd-anope (stable)
path: pytest.xml
test-ngircd-atheme:
needs:
- build-ngircd
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-ngircd
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//sbin:~/.local//bin:$PATH
make ngircd-atheme
- if: always()
name: Publish results
uses: actions/upload-artifact@v2
with:
name: pytest results ngircd-atheme (stable)
path: pytest.xml
test-plexus4: test-plexus4:
needs: needs:
- build-plexus4 - build-plexus4
@ -899,7 +1044,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/bin:$PATH run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
make unrealircd make unrealircd
- if: always() - if: always()
name: Publish results name: Publish results
@ -937,7 +1082,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/bin:$PATH make run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH make
unrealircd-anope unrealircd-anope
- if: always() - if: always()
name: Publish results name: Publish results
@ -969,7 +1114,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/bin:$PATH run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:$PATH
make unrealircd-atheme make unrealircd-atheme
- if: always() - if: always()
name: Publish results name: Publish results

35
Makefile
View File

@ -104,6 +104,20 @@ MAMMON_SELECTORS := \
and not strict \ and not strict \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
# testKeyValidation[spaces] and testKeyValidation[empty] fail because ngIRCd does not validate them https://github.com/ngircd/ngircd/issues/290
# 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
NGIRCD_SELECTORS := \
not Ergo \
and not deprecated \
and not strict \
and not (testKeyValidation and (spaces or empty)) \
and not testStarNick \
and not testEmptyRealname \
and not chathistory \
$(EXTRA_SELECTORS)
# testInviteUnoppedModern is the only strict test that Plexus4 fails # testInviteUnoppedModern 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 # testInviteInviteOnlyModern fails because Plexus4 allows non-op to invite if (and only if) the channel is not invite-only
PLEXUS4_SELECTORS := \ PLEXUS4_SELECTORS := \
@ -262,6 +276,27 @@ plexus4:
-m 'not services' \ -m 'not services' \
-k "$(PLEXUS4_SELECTORS)" -k "$(PLEXUS4_SELECTORS)"
ngircd:
$(PYTEST) $(PYTEST_ARGS) \
--controller irctest.controllers.ngircd \
-m 'not services' \
-n 10 \
-k "$(NGIRCD_SELECTORS)"
ngircd-anope:
$(PYTEST) $(PYTEST_ARGS) \
--controller irctest.controllers.ngircd \
--services-controller=irctest.controllers.anope_services \
-m 'services' \
-k "$(NGIRCD_SELECTORS)"
ngircd-atheme:
$(PYTEST) $(PYTEST_ARGS) \
--controller irctest.controllers.ngircd \
--services-controller=irctest.controllers.atheme_services \
-m 'services' \
-k "$(NGIRCD_SELECTORS)"
solanum: solanum:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.solanum \ --controller=irctest.controllers.solanum \

1
irctest/controllers/anope_services.py
View File

@ -83,6 +83,7 @@ class AnopeController(BaseServicesController, DirectoryBasedController):
"hybrid", "hybrid",
"plexus", "plexus",
"unreal4", "unreal4",
"ngircd",
) )
with self.open_file("conf/services.conf") as fd: with self.open_file("conf/services.conf") as fd:

3
irctest/controllers/atheme_services.py
View File

@ -17,6 +17,7 @@ loadmodule "modules/nickserv/cert";
loadmodule "modules/nickserv/register"; loadmodule "modules/nickserv/register";
loadmodule "modules/nickserv/verify"; loadmodule "modules/nickserv/verify";
loadmodule "modules/saslserv/main";
loadmodule "modules/saslserv/authcookie"; loadmodule "modules/saslserv/authcookie";
#loadmodule "modules/saslserv/ecdh-x25519-challenge"; #loadmodule "modules/saslserv/ecdh-x25519-challenge";
loadmodule "modules/saslserv/ecdsa-nist256p-challenge"; loadmodule "modules/saslserv/ecdsa-nist256p-challenge";
@ -61,7 +62,7 @@ class AthemeController(BaseServicesController, DirectoryBasedController):
if protocol == "inspircd3": if protocol == "inspircd3":
# That's the name used by Anope # That's the name used by Anope
protocol = "inspircd" protocol = "inspircd"
assert protocol in ("bahamut", "inspircd", "charybdis", "unreal4") assert protocol in ("bahamut", "inspircd", "charybdis", "unreal4", "ngircd")
with self.open_file("services.conf") as fd: with self.open_file("services.conf") as fd:
fd.write( fd.write(

117
irctest/controllers/ngircd.py Normal file
View File

@ -0,0 +1,117 @@
import os
import subprocess
from typing import Optional, Set, Type
from irctest.basecontrollers import (
BaseServerController,
DirectoryBasedController,
NotImplementedByController,
)
from irctest.irc_utils.junkdrawer import find_hostname_and_port
TEMPLATE_CONFIG = """
[Global]
Name = My.Little.Server
Info = ExampleNET Server
Bind = {hostname}
Ports = {port}
AdminInfo1 = Bob Smith
AdminEMail = email@example.org
{password_field}
[Server]
Name = services.example.org
MyPassword = password
PeerPassword = password
Passive = yes # don't connect to it
ServiceMask = *Serv
[Operator]
Name = operuser
Password = operpassword
"""
class NgircdController(BaseServerController, DirectoryBasedController):
software_name = "ngIRCd"
supported_sasl_mechanisms: Set[str] = set()
supports_sts = False
def create_config(self) -> None:
super().create_config()
with self.open_file("server.conf"):
pass
def run(
self,
hostname: str,
port: int,
*,
password: Optional[str],
ssl: bool,
run_services: bool,
valid_metadata_keys: Optional[Set[str]] = None,
invalid_metadata_keys: Optional[Set[str]] = None,
restricted_metadata_keys: Optional[Set[str]] = None,
) -> None:
if valid_metadata_keys or invalid_metadata_keys:
raise NotImplementedByController(
"Defining valid and invalid METADATA keys."
)
assert self.proc is None
self.port = port
self.hostname = hostname
self.create_config()
(unused_hostname, unused_port) = find_hostname_and_port()
password_field = "Password = {}".format(password) if password else ""
self.gen_ssl()
if ssl:
(tls_hostname, tls_port) = (hostname, port)
(hostname, port) = (unused_hostname, unused_port)
else:
# Unreal refuses to start without TLS enabled
(tls_hostname, tls_port) = (unused_hostname, unused_port)
with self.open_file("empty.txt") as fd:
fd.write("\n")
assert self.directory
with self.open_file("server.conf") as fd:
fd.write(
TEMPLATE_CONFIG.format(
hostname=hostname,
port=port,
tls_hostname=tls_hostname,
tls_port=tls_port,
password_field=password_field,
key_path=self.key_path,
pem_path=self.pem_path,
empty_file=os.path.join(self.directory, "empty.txt"),
)
)
self.proc = subprocess.Popen(
[
"ngircd",
"--nodaemon",
"--config",
os.path.join(self.directory, "server.conf"),
],
# stdout=subprocess.DEVNULL,
)
if run_services:
self.wait_for_port()
self.services_controller = self.services_controller_class(
self.test_config, self
)
self.services_controller.run(
protocol="ngircd",
server_hostname=hostname,
server_port=port,
)
def get_irctest_controller_class() -> Type[NgircdController]:
return NgircdController

2
irctest/server_tests/bot_mode.py
View File

@ -13,7 +13,7 @@ from irctest.patma import ANYDICT, ANYSTR, StrRe
class BotModeTestCase(cases.BaseServerTestCase): class BotModeTestCase(cases.BaseServerTestCase):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.connectClient("modegetter") self.connectClient("modegettr")
if "BOT" not in self.server_support: if "BOT" not in self.server_support:
raise runner.IsupportTokenNotSupported("BOT") raise runner.IsupportTokenNotSupported("BOT")
self._mode_char = self.server_support["BOT"] self._mode_char = self.server_support["BOT"]

3
irctest/server_tests/buffering.py
View File

@ -103,6 +103,9 @@ class BufferingTestCase(cases.BaseServerTestCase):
if not payload_intact: if not payload_intact:
# truncated # truncated
self.assertLessEqual(len(received_line), 512, received_line) self.assertLessEqual(len(received_line), 512, received_line)
if received_line.endswith(b"[CUT]\r\n"):
# ngircd
received_line = received_line[0:-7] + b"\r\n"
self.assertTrue( self.assertTrue(
payload.encode().startswith( payload.encode().startswith(
received_line.split(b" ")[-1].strip().lstrip(b":") received_line.split(b" ")[-1].strip().lstrip(b":")

2
irctest/server_tests/kick.py
View File

@ -166,6 +166,8 @@ class KickTestCase(cases.BaseServerTestCase):
@cases.mark_specifications("RFC2812") @cases.mark_specifications("RFC2812")
def testKickNonexistentChannel(self): def testKickNonexistentChannel(self):
"""“Kick command [...] Numeric replies: [...] ERR_NOSUCHCHANNEL.""" """“Kick command [...] Numeric replies: [...] ERR_NOSUCHCHANNEL."""
self.connectClient("nick")
self.connectClient("foo") self.connectClient("foo")
self.sendLine(1, "KICK #chan nick") self.sendLine(1, "KICK #chan nick")
m = self.getMessage(1) m = self.getMessage(1)

6
irctest/server_tests/list.py
View File

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

8
irctest/server_tests/whois.py
View File

@ -161,13 +161,13 @@ class _WhoisTestMixin(cases.BaseServerTestCase):
class WhoisTestCase(_WhoisTestMixin, cases.BaseServerTestCase, cases.OptionalityHelper): class WhoisTestCase(_WhoisTestMixin, cases.BaseServerTestCase, cases.OptionalityHelper):
@pytest.mark.parametrize( @pytest.mark.parametrize(
"server", "server",
["", "My.Little.Server", "myCoolNick"], ["", "My.Little.Server", "coolNick"],
ids=["no-target", "target_server", "target-nick"], ids=["no-target", "target_server", "target-nick"],
) )
@cases.mark_specifications("RFC2812") @cases.mark_specifications("RFC2812")
def testWhoisUser(self, server): def testWhoisUser(self, server):
"""Test basic WHOIS behavior""" """Test basic WHOIS behavior"""
nick = "myCoolNick" nick = "coolNick"
username = "myusernam" # may be truncated if longer than this username = "myusernam" # may be truncated if longer than this
realname = "My User Name" realname = "My User Name"
self.addClient() self.addClient()
@ -175,9 +175,9 @@ class WhoisTestCase(_WhoisTestMixin, cases.BaseServerTestCase, cases.Optionality
self.sendLine(1, f"USER {username} 0 * :{realname}") self.sendLine(1, f"USER {username} 0 * :{realname}")
self.skipToWelcome(1) self.skipToWelcome(1)
self.connectClient("otherNickname") self.connectClient("otherNick")
self.getMessages(2) self.getMessages(2)
self.sendLine(2, f"WHOIS {server} mycoolnick") self.sendLine(2, f"WHOIS {server} coolnick")
messages = self.getMessages(2) messages = self.getMessages(2)
whois_user = messages[0] whois_user = messages[0]
self.assertEqual(whois_user.command, RPL_WHOISUSER) self.assertEqual(whois_user.command, RPL_WHOISUSER)

6
make_workflows.py
View File

@ -152,7 +152,11 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
env += test_config.get("env", {}).get(version_flavor.value, "") + " " env += test_config.get("env", {}).get(version_flavor.value, "") + " "
if "prefix" in software_config: if "prefix" in software_config:
env += f"PATH={software_config['prefix']}/bin:$PATH " env += (
f"PATH={software_config['prefix']}/sbin"
f":{software_config['prefix']}/bin"
f":$PATH "
)
if software_config["separate_build_job"]: if software_config["separate_build_job"]:
needs.append(f"build-{software_id}") needs.append(f"build-{software_id}")

27
workflows.yml
View File

@ -204,6 +204,24 @@ software:
make -j 4 make -j 4
make install make install
ngircd:
name: ngircd
repository: ngircd/ngircd
refs:
stable: rel-26.1
release: null
devel: master
devel_release: null
path: ngircd
prefix: ~/.local/
separate_build_job: true
build_script: |
cd $GITHUB_WORKSPACE/ngircd
./autogen.sh
./configure --prefix=$HOME/.local/
make -j 4
make install
snircd: snircd:
name: snircd name: snircd
repository: quakenet/snircd repository: quakenet/snircd
@ -314,6 +332,15 @@ tests:
inspircd-anope: inspircd-anope:
software: [inspircd, anope] software: [inspircd, anope]
ngircd:
software: [ngircd]
ngircd-atheme:
software: [ngircd]
ngircd-anope:
software: [ngircd, anope]
plexus4: plexus4:
software: [plexus4, anope] software: [plexus4, anope]