mirror of
https://github.com/progval/irctest.git
synced 2025-04-04 22:39:50 +00:00
Compare commits
2 Commits
sable-pg-h
...
e50cac1a39
| Author | SHA1 | Date | |
|---|---|---|---|
| e50cac1a39 | |||
| 6243908ecc |
98
.github/workflows/test-devel.yml
vendored
98
.github/workflows/test-devel.yml
vendored
@ -453,9 +453,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
bahamut
|
||||
timeout-minutes: 30
|
||||
@ -494,9 +492,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
bahamut-anope
|
||||
timeout-minutes: 30
|
||||
@ -529,9 +525,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
bahamut-atheme
|
||||
timeout-minutes: 30
|
||||
@ -558,7 +552,7 @@ jobs:
|
||||
repository: ergochat/ergo
|
||||
- uses: actions/setup-go@v3
|
||||
with:
|
||||
go-version: ^1.23.0
|
||||
go-version: ^1.22.0
|
||||
- run: go version
|
||||
- name: Build Ergo
|
||||
run: |
|
||||
@ -571,9 +565,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/go/sbin:~/go/bin:~/go:$PATH
|
||||
make ergo
|
||||
timeout-minutes: 30
|
||||
@ -612,9 +604,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
hybrid
|
||||
timeout-minutes: 30
|
||||
@ -647,9 +637,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
|
||||
make inspircd
|
||||
timeout-minutes: 30
|
||||
@ -688,9 +676,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH make
|
||||
inspircd-anope
|
||||
timeout-minutes: 30
|
||||
@ -729,9 +715,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
ircu2
|
||||
timeout-minutes: 30
|
||||
@ -759,9 +743,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
limnoria
|
||||
timeout-minutes: 30
|
||||
@ -799,9 +781,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
nefarious
|
||||
timeout-minutes: 30
|
||||
@ -834,9 +814,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH
|
||||
make ngircd
|
||||
timeout-minutes: 30
|
||||
@ -875,9 +853,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH make
|
||||
ngircd-anope
|
||||
timeout-minutes: 30
|
||||
@ -910,9 +886,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH
|
||||
make ngircd-atheme
|
||||
timeout-minutes: 30
|
||||
@ -951,9 +925,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
plexus4
|
||||
timeout-minutes: 30
|
||||
@ -990,7 +962,6 @@ jobs:
|
||||
cache-on-failure: true
|
||||
workspaces: sable -> target
|
||||
- run: rustc --version
|
||||
- run: sudo systemctl start postgresql.service
|
||||
- name: Build Sable
|
||||
run: |
|
||||
cd $GITHUB_WORKSPACE/sable/
|
||||
@ -1001,11 +972,8 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH
|
||||
IRCTEST_POSTGRESQL_URL=postgresql://localhost IRCTEST_DEBUG_LOGS=1 PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
|
||||
make sable
|
||||
timeout-minutes: 30
|
||||
- if: always()
|
||||
@ -1037,9 +1005,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
solanum
|
||||
timeout-minutes: 30
|
||||
@ -1066,9 +1032,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
sopel
|
||||
timeout-minutes: 30
|
||||
@ -1106,9 +1070,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
thelounge
|
||||
timeout-minutes: 30
|
||||
@ -1141,9 +1103,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
|
||||
make unrealircd
|
||||
timeout-minutes: 30
|
||||
@ -1176,9 +1136,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
|
||||
make unrealircd-5
|
||||
timeout-minutes: 30
|
||||
@ -1217,9 +1175,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH make
|
||||
unrealircd-anope
|
||||
timeout-minutes: 30
|
||||
@ -1252,9 +1208,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
|
||||
make unrealircd-atheme
|
||||
timeout-minutes: 30
|
||||
@ -1298,9 +1252,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
|
||||
IRCTEST_DLK_PATH="${{ github.workspace }}/Dlk-Services" IRCTEST_WP_CLI_PATH="${{
|
||||
github.workspace }}/wp-cli.phar" IRCTEST_WP_ZIP_PATH="${{ github.workspace
|
||||
|
||||
12
.github/workflows/test-devel_release.yml
vendored
12
.github/workflows/test-devel_release.yml
vendored
@ -126,9 +126,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
|
||||
make inspircd
|
||||
timeout-minutes: 30
|
||||
@ -167,9 +165,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH make
|
||||
inspircd-anope
|
||||
timeout-minutes: 30
|
||||
@ -202,9 +198,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
|
||||
make inspircd-atheme
|
||||
timeout-minutes: 30
|
||||
|
||||
116
.github/workflows/test-stable.yml
vendored
116
.github/workflows/test-stable.yml
vendored
@ -65,7 +65,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: Bahamut
|
||||
ref: v2.2.4
|
||||
ref: v2.2.1
|
||||
repository: DALnet/Bahamut
|
||||
- name: Build Bahamut
|
||||
run: |
|
||||
@ -189,7 +189,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: inspircd
|
||||
ref: v3.17.1
|
||||
ref: v3.17.0
|
||||
repository: inspircd/inspircd
|
||||
- name: Build InspIRCd
|
||||
run: |
|
||||
@ -228,7 +228,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: ngircd
|
||||
ref: acf8409c60ccc96beed0a1f990c4f9374823c0ce
|
||||
ref: 3e3f6cbeceefd9357b53b27c2386bb39306ab353
|
||||
repository: ngircd/ngircd
|
||||
- name: Build ngircd
|
||||
run: |
|
||||
@ -351,7 +351,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: unrealircd
|
||||
ref: a68625454078641ce984eeb197f7e02b1857ab6c
|
||||
ref: da3c1c654481a33035b9c703957e1c25d0158259
|
||||
repository: unrealircd/unrealircd
|
||||
- name: Build UnrealIRCd 6
|
||||
run: |
|
||||
@ -496,9 +496,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
bahamut
|
||||
timeout-minutes: 30
|
||||
@ -537,9 +535,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
bahamut-anope
|
||||
timeout-minutes: 30
|
||||
@ -572,9 +568,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
bahamut-atheme
|
||||
timeout-minutes: 30
|
||||
@ -607,9 +601,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
charybdis
|
||||
timeout-minutes: 30
|
||||
@ -636,7 +628,7 @@ jobs:
|
||||
repository: ergochat/ergo
|
||||
- uses: actions/setup-go@v3
|
||||
with:
|
||||
go-version: ^1.23.0
|
||||
go-version: ^1.22.0
|
||||
- run: go version
|
||||
- name: Build Ergo
|
||||
run: |
|
||||
@ -649,9 +641,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/go/sbin:~/go/bin:~/go:$PATH
|
||||
make ergo
|
||||
timeout-minutes: 30
|
||||
@ -690,9 +680,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
hybrid
|
||||
timeout-minutes: 30
|
||||
@ -725,9 +713,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
|
||||
make inspircd
|
||||
timeout-minutes: 30
|
||||
@ -766,9 +752,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH make
|
||||
inspircd-anope
|
||||
timeout-minutes: 30
|
||||
@ -801,9 +785,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
|
||||
make inspircd-atheme
|
||||
timeout-minutes: 30
|
||||
@ -853,9 +835,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
irc2
|
||||
timeout-minutes: 30
|
||||
@ -894,9 +874,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
ircu2
|
||||
timeout-minutes: 30
|
||||
@ -923,9 +901,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
limnoria
|
||||
timeout-minutes: 30
|
||||
@ -963,9 +939,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
nefarious
|
||||
timeout-minutes: 30
|
||||
@ -998,9 +972,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH
|
||||
make ngircd
|
||||
timeout-minutes: 30
|
||||
@ -1039,9 +1011,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH make
|
||||
ngircd-anope
|
||||
timeout-minutes: 30
|
||||
@ -1074,9 +1044,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local//sbin:~/.local//bin:~/.local/:$PATH
|
||||
make ngircd-atheme
|
||||
timeout-minutes: 30
|
||||
@ -1115,9 +1083,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
plexus4
|
||||
timeout-minutes: 30
|
||||
@ -1140,7 +1106,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: sable
|
||||
ref: 034c4d5dd937774099773238d8d5b8054b015607
|
||||
ref: e9701e5e8d0c4f278ddd61ce7285f4918ecf99e9
|
||||
repository: Libera-Chat/sable
|
||||
- name: Install rust toolchain
|
||||
uses: actions-rs/toolchain@v1
|
||||
@ -1154,7 +1120,6 @@ jobs:
|
||||
cache-on-failure: true
|
||||
workspaces: sable -> target
|
||||
- run: rustc --version
|
||||
- run: sudo systemctl start postgresql.service
|
||||
- name: Build Sable
|
||||
run: |
|
||||
cd $GITHUB_WORKSPACE/sable/
|
||||
@ -1165,11 +1130,8 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH
|
||||
IRCTEST_POSTGRESQL_URL=postgresql://localhost IRCTEST_DEBUG_LOGS=1 PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
|
||||
make sable
|
||||
timeout-minutes: 30
|
||||
- if: always()
|
||||
@ -1201,9 +1163,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
solanum
|
||||
timeout-minutes: 30
|
||||
@ -1230,9 +1190,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
sopel
|
||||
timeout-minutes: 30
|
||||
@ -1270,9 +1228,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH make
|
||||
thelounge
|
||||
timeout-minutes: 30
|
||||
@ -1305,9 +1261,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
|
||||
make unrealircd
|
||||
timeout-minutes: 30
|
||||
@ -1340,9 +1294,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
|
||||
make unrealircd-5
|
||||
timeout-minutes: 30
|
||||
@ -1381,9 +1333,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH make
|
||||
unrealircd-anope
|
||||
timeout-minutes: 30
|
||||
@ -1416,9 +1366,7 @@ jobs:
|
||||
run: |-
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest pytest-xdist pytest-timeout -r requirements.txt
|
||||
- env:
|
||||
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
|
||||
name: Test with pytest
|
||||
- name: Test with pytest
|
||||
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/sbin:~/.local/unrealircd/bin:~/.local/unrealircd:$PATH
|
||||
make unrealircd-atheme
|
||||
timeout-minutes: 30
|
||||
|
||||
199
Makefile
199
Makefile
@ -4,161 +4,112 @@ PYTEST ?= python3 -m pytest
|
||||
# pytest-xdist is installed)
|
||||
PYTEST_ARGS ?=
|
||||
|
||||
# Will be appended at the end of the -m argument to pytest
|
||||
EXTRA_MARKERS ?=
|
||||
|
||||
# Will be appended at the end of the -k argument to pytest
|
||||
EXTRA_SELECTORS ?=
|
||||
|
||||
BAHAMUT_MARKERS := \
|
||||
not implementation-specific \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
and not IRCv3 \
|
||||
$(EXTRA_MARKERS)
|
||||
BAHAMUT_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
CHARYBDIS_MARKERS := \
|
||||
not implementation-specific \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
$(EXTRA_MARKERS)
|
||||
and not IRCv3 \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
CHARYBDIS_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
ERGO_MARKERS := \
|
||||
(Ergo or not implementation-specific) \
|
||||
and not deprecated \
|
||||
$(EXTRA_MARKERS)
|
||||
ERGO_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
not deprecated \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
HYBRID_MARKERS := \
|
||||
not implementation-specific \
|
||||
and not deprecated \
|
||||
$(EXTRA_MARKERS)
|
||||
HYBRID_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
INSPIRCD_MARKERS := \
|
||||
not implementation-specific \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
$(EXTRA_MARKERS)
|
||||
INSPIRCD_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
IRCU2_MARKERS := \
|
||||
not implementation-specific \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
and not IRCv3 \
|
||||
$(EXTRA_MARKERS)
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
IRCU2_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
NEFARIOUS_MARKERS := \
|
||||
not implementation-specific \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
$(EXTRA_MARKERS)
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
NEFARIOUS_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
SNIRCD_MARKERS := \
|
||||
not implementation-specific \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
and not IRCv3 \
|
||||
$(EXTRA_MARKERS)
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
SNIRCD_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
IRC2_MARKERS := \
|
||||
not implementation-specific \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
and not IRCv3 \
|
||||
$(EXTRA_MARKERS)
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
IRC2_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
MAMMON_MARKERS := \
|
||||
not implementation-specific \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
$(EXTRA_MARKERS)
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
MAMMON_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
NGIRCD_MARKERS := \
|
||||
not implementation-specific \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
$(EXTRA_MARKERS)
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
NGIRCD_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
PLEXUS4_MARKERS := \
|
||||
not implementation-specific \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
$(EXTRA_MARKERS)
|
||||
PLEXUS4_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
and not strict \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
LIMNORIA_MARKERS := \
|
||||
not implementation-specific \
|
||||
$(EXTRA_MARKERS)
|
||||
PLEXUS4_SELECTORS := \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
# Limnoria can actually pass all the test so there is none to exclude.
|
||||
# `(foo or not foo)` serves as a `true` value so it doesn't break when
|
||||
# $(EXTRA_SELECTORS) is non-empty
|
||||
LIMNORIA_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
# Tests marked with arbitrary_client_tags or react_tag can't pass because Sable does not support client tags yet
|
||||
# 'SablePostgresqlHistoryTestCase and private_chathistory' disabled because Sable does not (yet?) persist private messages to postgresql
|
||||
SABLE_MARKERS := \
|
||||
(Sable or not implementation-specific) \
|
||||
# Tests marked with private_chathistory can't pass because Sable does not implement CHATHISTORY for DMs
|
||||
|
||||
SABLE_SELECTORS := \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
and not arbitrary_client_tags \
|
||||
and not react_tag \
|
||||
$(EXTRA_MARKERS)
|
||||
SABLE_SELECTORS := \
|
||||
not list and not lusers and not time and not info \
|
||||
and not (SablePostgresqlHistoryTestCase and private_chathistory) \
|
||||
and not private_chathistory \
|
||||
and not list and not lusers and not time and not info \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
SOLANUM_MARKERS := \
|
||||
not implementation-specific \
|
||||
SOLANUM_SELECTORS := \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
$(EXTRA_MARKERS)
|
||||
SOLANUM_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
SOPEL_MARKERS := \
|
||||
not implementation-specific \
|
||||
$(EXTRA_MARKERS)
|
||||
# Same as Limnoria
|
||||
SOPEL_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
THELOUNGE_MARKERS := \
|
||||
not implementation-specific \
|
||||
$(EXTRA_MARKERS)
|
||||
# TheLounge can actually pass all the test so there is none to exclude.
|
||||
# `(foo or not foo)` serves as a `true` value so it doesn't break when
|
||||
# $(EXTRA_SELECTORS) is non-empty
|
||||
THELOUNGE_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
@ -167,16 +118,13 @@ THELOUNGE_SELECTORS := \
|
||||
# Tests marked with react_tag can't pass because Unreal blocks +draft/react https://github.com/unrealircd/unrealircd/pull/149
|
||||
# Tests marked with private_chathistory can't pass because Unreal does not implement CHATHISTORY for DMs
|
||||
|
||||
UNREALIRCD_MARKERS := \
|
||||
not implementation-specific \
|
||||
UNREALIRCD_SELECTORS := \
|
||||
not Ergo \
|
||||
and not deprecated \
|
||||
and not strict \
|
||||
and not arbitrary_client_tags \
|
||||
and not react_tag \
|
||||
and not private_chathistory \
|
||||
$(EXTRA_MARKERS)
|
||||
UNREALIRCD_SELECTORS := \
|
||||
(foo or not foo) \
|
||||
$(EXTRA_SELECTORS)
|
||||
|
||||
.PHONY: all flakes bahamut charybdis ergo inspircd ircu2 snircd irc2 mammon nefarious limnoria sable sopel solanum unrealircd
|
||||
@ -192,114 +140,107 @@ bahamut:
|
||||
-m 'not services' \
|
||||
-n 4 \
|
||||
-vv -s \
|
||||
-m 'not services and $(BAHAMUT_MARKERS)'
|
||||
-k '$(BAHAMUT_SELECTORS)'
|
||||
|
||||
bahamut-atheme:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.bahamut \
|
||||
--services-controller=irctest.controllers.atheme_services \
|
||||
-m 'services and $(BAHAMUT_MARKERS)' \
|
||||
-m 'services' \
|
||||
-k '$(BAHAMUT_SELECTORS)'
|
||||
|
||||
bahamut-anope:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.bahamut \
|
||||
--services-controller=irctest.controllers.anope_services \
|
||||
-m 'services and $(BAHAMUT_MARKERS)' \
|
||||
-m 'services' \
|
||||
-k '$(BAHAMUT_SELECTORS)'
|
||||
|
||||
charybdis:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.charybdis \
|
||||
--services-controller=irctest.controllers.atheme_services \
|
||||
-m '$(CHARYBDIS_MARKERS)'
|
||||
-k '$(CHARYBDIS_SELECTORS)'
|
||||
|
||||
ergo:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller irctest.controllers.ergo \
|
||||
-m '$(ERGO_MARKERS)'
|
||||
-k "$(ERGO_SELECTORS)"
|
||||
|
||||
hybrid:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller irctest.controllers.hybrid \
|
||||
--services-controller=irctest.controllers.anope_services \
|
||||
-m '$(HYBRID_MARKERS)'
|
||||
-k "$(HYBRID_SELECTORS)"
|
||||
|
||||
inspircd:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.inspircd \
|
||||
-m 'not services and $(INSPIRCD_MARKERS)' \
|
||||
-m 'not services' \
|
||||
-k '$(INSPIRCD_SELECTORS)'
|
||||
|
||||
inspircd-atheme:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.inspircd \
|
||||
--services-controller=irctest.controllers.atheme_services \
|
||||
-m 'services and $(INSPIRCD_MARKERS)' \
|
||||
-m 'services' \
|
||||
-k '$(INSPIRCD_SELECTORS)'
|
||||
|
||||
inspircd-anope:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.inspircd \
|
||||
--services-controller=irctest.controllers.anope_services \
|
||||
-m 'services and $(INSPIRCD_MARKERS)' \
|
||||
-m 'services' \
|
||||
-k '$(INSPIRCD_SELECTORS)'
|
||||
|
||||
ircu2:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.ircu2 \
|
||||
-m 'not services and $(IRCU2_MARKERS)' \
|
||||
-m 'not services and not IRCv3' \
|
||||
-n 4 \
|
||||
-k '$(IRCU2_SELECTORS)'
|
||||
|
||||
nefarious:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.nefarious \
|
||||
-m 'not services and $(NEFARIOUS_MARKERS)' \
|
||||
-m 'not services' \
|
||||
-n 4 \
|
||||
-k '$(NEFARIOUS_SELECTORS)'
|
||||
|
||||
snircd:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.snircd \
|
||||
-m 'not services and $(SNIRCD_MARKERS)' \
|
||||
-m 'not services and not IRCv3' \
|
||||
-n 4 \
|
||||
-k '$(SNIRCD_SELECTORS)'
|
||||
|
||||
irc2:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.irc2 \
|
||||
-m 'not services and $(IRCU2_MARKERS)' \
|
||||
-m 'not services and not IRCv3' \
|
||||
-n 4 \
|
||||
-k '$(IRC2_SELECTORS)'
|
||||
|
||||
limnoria:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.limnoria \
|
||||
-m '$(LIMNORIA_MARKERS)' \
|
||||
-k '$(LIMNORIA_SELECTORS)'
|
||||
|
||||
mammon:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.mammon \
|
||||
-m '$(MAMMON_MARKERS)' \
|
||||
-k '$(MAMMON_SELECTORS)'
|
||||
|
||||
plexus4:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller irctest.controllers.plexus4 \
|
||||
--services-controller=irctest.controllers.anope_services \
|
||||
-m '$(PLEXUS4_MARKERS)' \
|
||||
-k "$(PLEXUS4_SELECTORS)"
|
||||
|
||||
ngircd:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller irctest.controllers.ngircd \
|
||||
-m 'not services and $(NGIRCD_MARKERS)' \
|
||||
-m 'not services' \
|
||||
-n 4 \
|
||||
-k "$(NGIRCD_SELECTORS)"
|
||||
|
||||
@ -307,20 +248,19 @@ ngircd-anope:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller irctest.controllers.ngircd \
|
||||
--services-controller=irctest.controllers.anope_services \
|
||||
-m 'services and $(NGIRCD_MARKERS)' \
|
||||
-m 'services' \
|
||||
-k "$(NGIRCD_SELECTORS)"
|
||||
|
||||
ngircd-atheme:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller irctest.controllers.ngircd \
|
||||
--services-controller=irctest.controllers.atheme_services \
|
||||
-m 'services and $(NGIRCD_MARKERS)' \
|
||||
-m 'services' \
|
||||
-k "$(NGIRCD_SELECTORS)"
|
||||
|
||||
sable:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.sable \
|
||||
-m '$(SABLE_MARKERS)' \
|
||||
-n 20 \
|
||||
-k '$(SABLE_SELECTORS)'
|
||||
|
||||
@ -328,25 +268,22 @@ solanum:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.solanum \
|
||||
--services-controller=irctest.controllers.atheme_services \
|
||||
-m '$(SOLANUM_MARKERS)' \
|
||||
-k '$(SOLANUM_SELECTORS)'
|
||||
|
||||
sopel:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.sopel \
|
||||
-m '$(SOPEL_MARKERS)' \
|
||||
-k '$(SOPEL_SELECTORS)'
|
||||
|
||||
thelounge:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.thelounge \
|
||||
-m '$(THELOUNGE_MARKERS)' \
|
||||
-k '$(THELOUNGE_SELECTORS)'
|
||||
|
||||
unrealircd:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.unrealircd \
|
||||
-m 'not services and $(UNREALIRCD_MARKERS)' \
|
||||
-m 'not services' \
|
||||
-k '$(UNREALIRCD_SELECTORS)'
|
||||
|
||||
unrealircd-5: unrealircd
|
||||
@ -355,19 +292,19 @@ unrealircd-atheme:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.unrealircd \
|
||||
--services-controller=irctest.controllers.atheme_services \
|
||||
-m 'services and $(UNREALIRCD_MARKERS)' \
|
||||
-m 'services' \
|
||||
-k '$(UNREALIRCD_SELECTORS)'
|
||||
|
||||
unrealircd-anope:
|
||||
$(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.unrealircd \
|
||||
--services-controller=irctest.controllers.anope_services \
|
||||
-m 'services and $(UNREALIRCD_MARKERS)' \
|
||||
-m 'services' \
|
||||
-k '$(UNREALIRCD_SELECTORS)'
|
||||
|
||||
unrealircd-dlk:
|
||||
pifpaf run mysql -- $(PYTEST) $(PYTEST_ARGS) \
|
||||
--controller=irctest.controllers.unrealircd \
|
||||
--services-controller=irctest.controllers.dlk_services \
|
||||
-m 'services and $(UNREALIRCD_MARKERS)' \
|
||||
-m 'services' \
|
||||
-k '$(UNREALIRCD_SELECTORS)'
|
||||
|
||||
@ -8,25 +8,10 @@ from pathlib import Path
|
||||
import shutil
|
||||
import socket
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import textwrap
|
||||
import threading
|
||||
import time
|
||||
from typing import (
|
||||
IO,
|
||||
Any,
|
||||
Callable,
|
||||
Dict,
|
||||
Iterator,
|
||||
List,
|
||||
Optional,
|
||||
Sequence,
|
||||
Set,
|
||||
Tuple,
|
||||
Type,
|
||||
Union,
|
||||
)
|
||||
from typing import IO, Any, Callable, Dict, Iterator, List, Optional, Set, Tuple, Type
|
||||
|
||||
import irctest
|
||||
|
||||
@ -69,9 +54,6 @@ class TestCaseControllerConfig:
|
||||
This should be used as little as possible, using the other attributes instead;
|
||||
as they are work with any controller."""
|
||||
|
||||
sable_history_server: bool = False
|
||||
"""Whether to start Sable's long-term history server"""
|
||||
|
||||
|
||||
class _BaseController:
|
||||
"""Base class for software controllers.
|
||||
@ -92,7 +74,6 @@ class _BaseController:
|
||||
_port_lock = FileLock(Path(tempfile.gettempdir()) / "irctest_ports.json.lock")
|
||||
|
||||
def __init__(self, test_config: TestCaseControllerConfig):
|
||||
self.debug_mode = os.getenv("IRCTEST_DEBUG_LOGS", "0").lower() in ("true", "1")
|
||||
self.test_config = test_config
|
||||
self.proc = None
|
||||
self._own_ports: Set[Tuple[str, int]] = set()
|
||||
@ -149,50 +130,6 @@ class _BaseController:
|
||||
used_ports.remove((hostname, port))
|
||||
self._own_ports.remove((hostname, port))
|
||||
|
||||
def execute(
|
||||
self,
|
||||
command: Sequence[Union[str, Path]],
|
||||
proc_name: Optional[str] = None,
|
||||
**kwargs: Any,
|
||||
) -> subprocess.Popen:
|
||||
output_to = None if self.debug_mode else subprocess.DEVNULL
|
||||
proc_name = proc_name or str(command[0])
|
||||
kwargs.setdefault("stdout", output_to)
|
||||
kwargs.setdefault("stderr", output_to)
|
||||
stream_stdout = stream_stderr = None
|
||||
if kwargs["stdout"] in (None, subprocess.STDOUT):
|
||||
kwargs["stdout"] = subprocess.PIPE
|
||||
|
||||
def stream_stdout() -> None:
|
||||
assert proc.stdout is not None # for mypy
|
||||
for line in proc.stdout:
|
||||
prefix = f"{time.time():.3f} {proc_name} ".encode()
|
||||
try:
|
||||
sys.stdout.buffer.write(prefix + line)
|
||||
except ValueError:
|
||||
# "I/O operation on closed file"
|
||||
pass
|
||||
|
||||
if kwargs["stderr"] in (subprocess.STDOUT, None):
|
||||
kwargs["stderr"] = subprocess.PIPE
|
||||
|
||||
def stream_stderr() -> None:
|
||||
assert proc.stderr is not None # for mypy
|
||||
for line in proc.stderr:
|
||||
prefix = f"{time.time():.3f} {proc_name} ".encode()
|
||||
try:
|
||||
sys.stdout.buffer.write(prefix + line)
|
||||
except ValueError:
|
||||
# "I/O operation on closed file"
|
||||
pass
|
||||
|
||||
proc = subprocess.Popen(command, **kwargs)
|
||||
if stream_stdout is not None:
|
||||
threading.Thread(target=stream_stdout, name="stream_stdout").start()
|
||||
if stream_stderr is not None:
|
||||
threading.Thread(target=stream_stderr, name="stream_stderr").start()
|
||||
return proc
|
||||
|
||||
|
||||
class DirectoryBasedController(_BaseController):
|
||||
"""Helper for controllers whose software configuration is based on an
|
||||
@ -316,7 +253,6 @@ class BaseServerController(_BaseController):
|
||||
def __init__(self, *args: Any, **kwargs: Any):
|
||||
super().__init__(*args, **kwargs)
|
||||
self.faketime_enabled = False
|
||||
self.services_controller = None
|
||||
|
||||
def run(
|
||||
self,
|
||||
|
||||
@ -842,22 +842,16 @@ def mark_services(cls: TClass) -> TClass:
|
||||
def mark_specifications(
|
||||
*specifications_str: str, deprecated: bool = False, strict: bool = False
|
||||
) -> Callable[[TCallable], TCallable]:
|
||||
specifications = {
|
||||
specifications = frozenset(
|
||||
Specifications.from_name(s) if isinstance(s, str) else s
|
||||
for s in specifications_str
|
||||
}
|
||||
)
|
||||
if None in specifications:
|
||||
raise ValueError("Invalid set of specifications: {}".format(specifications))
|
||||
|
||||
is_implementation_specific = all(
|
||||
spec.is_implementation_specific() for spec in specifications
|
||||
)
|
||||
|
||||
def decorator(f: TCallable) -> TCallable:
|
||||
for specification in specifications:
|
||||
f = getattr(pytest.mark, specification.value)(f)
|
||||
if is_implementation_specific:
|
||||
f = getattr(pytest.mark, "implementation-specific")(f)
|
||||
if strict:
|
||||
f = pytest.mark.strict(f)
|
||||
if deprecated:
|
||||
|
||||
@ -136,19 +136,16 @@ class AnopeController(BaseServicesController, DirectoryBasedController):
|
||||
Path(services_path).parent.parent / "modules"
|
||||
)
|
||||
|
||||
extra_args = []
|
||||
if self.debug_mode:
|
||||
extra_args.append("--debug")
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
"anope",
|
||||
"--config=services.conf", # can't be an absolute path in 2.0
|
||||
"--nofork", # don't fork
|
||||
"--nopid", # don't write a pid
|
||||
*extra_args,
|
||||
],
|
||||
cwd=self.directory,
|
||||
# stdout=subprocess.DEVNULL,
|
||||
# stderr=subprocess.DEVNULL,
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
import subprocess
|
||||
from typing import Optional, Type
|
||||
|
||||
import irctest
|
||||
@ -74,7 +75,7 @@ class AthemeController(BaseServicesController, DirectoryBasedController):
|
||||
)
|
||||
|
||||
assert self.directory
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
"atheme-services",
|
||||
"-n", # don't fork
|
||||
@ -87,6 +88,8 @@ class AthemeController(BaseServicesController, DirectoryBasedController):
|
||||
"-D",
|
||||
self.directory,
|
||||
],
|
||||
# stdout=subprocess.DEVNULL,
|
||||
# stderr=subprocess.DEVNULL,
|
||||
)
|
||||
|
||||
def registerUser(
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import subprocess
|
||||
from typing import Optional, Set, Type
|
||||
|
||||
from irctest.basecontrollers import BaseServerController, DirectoryBasedController
|
||||
@ -149,7 +150,7 @@ class BahamutController(BaseServerController, DirectoryBasedController):
|
||||
else:
|
||||
faketime_cmd = []
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
*faketime_cmd,
|
||||
"ircd",
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import subprocess
|
||||
from typing import Optional
|
||||
|
||||
from irctest.basecontrollers import BaseServerController, DirectoryBasedController
|
||||
@ -73,7 +74,7 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
|
||||
else:
|
||||
faketime_cmd = []
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
*faketime_cmd,
|
||||
self.binary_name,
|
||||
@ -83,6 +84,7 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
|
||||
"-pidfile",
|
||||
self.directory / "server.pid",
|
||||
],
|
||||
# stderr=subprocess.DEVNULL,
|
||||
)
|
||||
|
||||
if run_services:
|
||||
|
||||
@ -200,7 +200,7 @@ class DlkController(BaseServicesController, DirectoryBasedController):
|
||||
fd.write(TEMPLATE_DLK_WP_CONFIG.format(**template_vars))
|
||||
(dlk_conf_dir / "modules.conf").symlink_to(self.dlk_path / "conf/modules.conf")
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
"php",
|
||||
"src/dalek",
|
||||
|
||||
@ -213,7 +213,7 @@ class ErgoController(BaseServerController, DirectoryBasedController):
|
||||
else:
|
||||
faketime_cmd = []
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[*faketime_cmd, "ergo", "run", "--conf", self._config_path, "--quiet"]
|
||||
)
|
||||
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
import subprocess
|
||||
from typing import Optional, Type
|
||||
|
||||
from irctest import authentication, tls
|
||||
@ -30,7 +31,7 @@ class GircController(BaseClientController, DirectoryBasedController):
|
||||
args += ["--sasl-fail-is-ok"]
|
||||
|
||||
# Runs a client with the config given as arguments
|
||||
self.proc = self.execute(["girc_test", "connect"] + args)
|
||||
self.proc = subprocess.Popen(["girc_test", "connect"] + args)
|
||||
|
||||
|
||||
def get_irctest_controller_class() -> Type[GircController]:
|
||||
|
||||
@ -33,8 +33,7 @@ TEMPLATE_CONFIG = """
|
||||
class="ServerOperators"
|
||||
>
|
||||
|
||||
<options casemapping="ascii"
|
||||
extbanformat="any">
|
||||
<options casemapping="ascii">
|
||||
|
||||
# Disable 'NOTICE #chan :*** foo invited bar into the channel-
|
||||
<security announceinvites="none">
|
||||
@ -183,22 +182,15 @@ class InspircdController(BaseServerController, DirectoryBasedController):
|
||||
else:
|
||||
faketime_cmd = []
|
||||
|
||||
extra_args = []
|
||||
if self.debug_mode:
|
||||
if installed_version() >= 4:
|
||||
extra_args.append("--protocoldebug")
|
||||
else:
|
||||
extra_args.append("--debug")
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
*faketime_cmd,
|
||||
"inspircd",
|
||||
"--nofork",
|
||||
"--config",
|
||||
self.directory / "server.conf",
|
||||
*extra_args,
|
||||
],
|
||||
stdout=subprocess.DEVNULL,
|
||||
)
|
||||
|
||||
if run_services:
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import shutil
|
||||
import subprocess
|
||||
from typing import Optional, Type
|
||||
|
||||
from irctest.basecontrollers import (
|
||||
@ -77,7 +78,7 @@ class Irc2Controller(BaseServerController, DirectoryBasedController):
|
||||
else:
|
||||
faketime_cmd = []
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
*faketime_cmd,
|
||||
"ircd",
|
||||
@ -87,6 +88,7 @@ class Irc2Controller(BaseServerController, DirectoryBasedController):
|
||||
"-f",
|
||||
self.directory / "server.conf",
|
||||
],
|
||||
# stderr=subprocess.DEVNULL,
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import shutil
|
||||
import subprocess
|
||||
from typing import Optional, Type
|
||||
|
||||
from irctest.basecontrollers import (
|
||||
@ -96,7 +97,7 @@ class Ircu2Controller(BaseServerController, DirectoryBasedController):
|
||||
else:
|
||||
faketime_cmd = []
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
*faketime_cmd,
|
||||
"ircd",
|
||||
@ -106,6 +107,7 @@ class Ircu2Controller(BaseServerController, DirectoryBasedController):
|
||||
"-x",
|
||||
"DEBUG",
|
||||
],
|
||||
# stderr=subprocess.DEVNULL,
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
import subprocess
|
||||
from typing import Optional, Type
|
||||
|
||||
from irctest import authentication, tls
|
||||
@ -83,7 +84,7 @@ class LimnoriaController(BaseClientController, DirectoryBasedController):
|
||||
)
|
||||
)
|
||||
assert self.directory
|
||||
self.proc = self.execute(["supybot", self.directory / "bot.conf"])
|
||||
self.proc = subprocess.Popen(["supybot", self.directory / "bot.conf"])
|
||||
|
||||
|
||||
def get_irctest_controller_class() -> Type[LimnoriaController]:
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import shutil
|
||||
import subprocess
|
||||
from typing import Optional, Set, Type
|
||||
|
||||
from irctest.basecontrollers import (
|
||||
@ -115,7 +116,7 @@ class MammonController(BaseServerController, DirectoryBasedController):
|
||||
else:
|
||||
faketime_cmd = []
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
*faketime_cmd,
|
||||
"mammond",
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import shutil
|
||||
import subprocess
|
||||
from typing import Optional, Set, Type
|
||||
|
||||
from irctest.basecontrollers import BaseServerController, DirectoryBasedController
|
||||
@ -27,9 +28,6 @@ TEMPLATE_CONFIG = """
|
||||
[Operator]
|
||||
Name = operuser
|
||||
Password = operpassword
|
||||
|
||||
[Limits]
|
||||
MaxNickLength = 32 # defaults to 9
|
||||
"""
|
||||
|
||||
|
||||
@ -94,7 +92,7 @@ class NgircdController(BaseServerController, DirectoryBasedController):
|
||||
else:
|
||||
faketime_cmd = []
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
*faketime_cmd,
|
||||
"ngircd",
|
||||
@ -102,6 +100,7 @@ class NgircdController(BaseServerController, DirectoryBasedController):
|
||||
"--config",
|
||||
self.directory / "server.conf",
|
||||
],
|
||||
# stdout=subprocess.DEVNULL,
|
||||
)
|
||||
|
||||
if run_services:
|
||||
|
||||
@ -4,9 +4,8 @@ import shutil
|
||||
import signal
|
||||
import subprocess
|
||||
import tempfile
|
||||
import threading
|
||||
import time
|
||||
from typing import Any, Optional, Sequence, Type
|
||||
from typing import Optional, Type
|
||||
|
||||
from irctest.basecontrollers import (
|
||||
BaseServerController,
|
||||
@ -15,7 +14,6 @@ from irctest.basecontrollers import (
|
||||
NotImplementedByController,
|
||||
)
|
||||
from irctest.cases import BaseServerTestCase
|
||||
from irctest.client_mock import ClientMock
|
||||
from irctest.exceptions import NoMessageException
|
||||
from irctest.patma import ANYSTR
|
||||
|
||||
@ -87,13 +85,7 @@ def certs_dir() -> Path:
|
||||
certs_dir = tempfile.TemporaryDirectory()
|
||||
(Path(certs_dir.name) / "gen_certs.sh").write_text(GEN_CERTS)
|
||||
subprocess.run(
|
||||
[
|
||||
"bash",
|
||||
"gen_certs.sh",
|
||||
"My.Little.Server",
|
||||
"My.Little.History",
|
||||
"My.Little.Services",
|
||||
],
|
||||
["bash", "gen_certs.sh", "My.Little.Server", "My.Little.Services"],
|
||||
cwd=certs_dir.name,
|
||||
check=True,
|
||||
)
|
||||
@ -103,11 +95,10 @@ def certs_dir() -> Path:
|
||||
|
||||
NETWORK_CONFIG = """
|
||||
{
|
||||
"fanout": 2,
|
||||
"fanout": 1,
|
||||
"ca_file": "%(certs_dir)s/ca_cert.pem",
|
||||
|
||||
"peers": [
|
||||
{ "name": "My.Little.History", "address": "%(history_hostname)s:%(history_port)s", "fingerprint": "%(history_cert_sha1)s" },
|
||||
{ "name": "My.Little.Services", "address": "%(services_hostname)s:%(services_port)s", "fingerprint": "%(services_cert_sha1)s" },
|
||||
{ "name": "My.Little.Server", "address": "%(server1_hostname)s:%(server1_port)s", "fingerprint": "%(server1_cert_sha1)s" }
|
||||
]
|
||||
@ -116,8 +107,6 @@ NETWORK_CONFIG = """
|
||||
|
||||
NETWORK_CONFIG_CONFIG = """
|
||||
{
|
||||
"object_expiry": 60, // 1 minute
|
||||
|
||||
"opers": [
|
||||
{
|
||||
"name": "operuser",
|
||||
@ -228,58 +217,6 @@ SERVER_CONFIG = """
|
||||
}
|
||||
"""
|
||||
|
||||
HISTORY_SERVER_CONFIG = """
|
||||
{
|
||||
"server_id": 50,
|
||||
"server_name": "My.Little.History",
|
||||
|
||||
"management": {
|
||||
"address": "%(history_management_hostname)s:%(history_management_port)s",
|
||||
"client_ca": "%(certs_dir)s/ca_cert.pem",
|
||||
"authorised_fingerprints": [
|
||||
{ "name": "user1", "fingerprint": "435bc6db9f22e84ba5d9652432154617c9509370" }
|
||||
]
|
||||
},
|
||||
|
||||
"server": {
|
||||
"database": "%(history_db_url)s",
|
||||
"auto_run_migrations": true,
|
||||
},
|
||||
|
||||
"event_log": {
|
||||
"event_expiry": 300, // five minutes, for local testing
|
||||
},
|
||||
|
||||
"tls_config": {
|
||||
"key_file": "%(certs_dir)s/My.Little.History.key",
|
||||
"cert_file": "%(certs_dir)s/My.Little.History.pem"
|
||||
},
|
||||
|
||||
"node_config": {
|
||||
"listen_addr": "%(history_hostname)s:%(history_port)s",
|
||||
"cert_file": "%(certs_dir)s/My.Little.History.pem",
|
||||
"key_file": "%(certs_dir)s/My.Little.History.key"
|
||||
},
|
||||
|
||||
"log": {
|
||||
"dir": "log/services/",
|
||||
|
||||
"module-levels": {
|
||||
"": "debug",
|
||||
"sable_history": "trace",
|
||||
},
|
||||
|
||||
"targets": [
|
||||
{
|
||||
"target": "stdout",
|
||||
"level": "trace",
|
||||
"modules": [ "sable" ]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
SERVICES_CONFIG = """
|
||||
{
|
||||
"server_id": 99,
|
||||
@ -358,7 +295,7 @@ SERVICES_CONFIG = """
|
||||
{
|
||||
"target": "stdout",
|
||||
"level": "debug",
|
||||
"modules": [ "sable" ]
|
||||
"modules": [ "sable_services" ]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -373,12 +310,6 @@ class SableController(BaseServerController, DirectoryBasedController):
|
||||
"""Sable processes commands very quickly, but responses for commands changing the
|
||||
state may be sent after later commands for messages which don't."""
|
||||
|
||||
history_controller: Optional[BaseServicesController] = None
|
||||
|
||||
def __init__(self, *args: Any, **kwargs: Any):
|
||||
super().__init__(*args, **kwargs)
|
||||
self.history_controller = None
|
||||
|
||||
def run(
|
||||
self,
|
||||
hostname: str,
|
||||
@ -415,11 +346,10 @@ class SableController(BaseServerController, DirectoryBasedController):
|
||||
|
||||
(server1_hostname, server1_port) = self.get_hostname_and_port()
|
||||
(services_hostname, services_port) = self.get_hostname_and_port()
|
||||
(history_hostname, history_port) = self.get_hostname_and_port()
|
||||
|
||||
# Sable requires inbound connections to match the configured hostname,
|
||||
# so we can't configure 0.0.0.0
|
||||
server1_hostname = history_hostname = services_hostname = "127.0.0.1"
|
||||
server1_hostname = services_hostname = "127.0.0.1"
|
||||
|
||||
(
|
||||
server1_management_hostname,
|
||||
@ -429,10 +359,6 @@ class SableController(BaseServerController, DirectoryBasedController):
|
||||
services_management_hostname,
|
||||
services_management_port,
|
||||
) = self.get_hostname_and_port()
|
||||
(
|
||||
history_management_hostname,
|
||||
history_management_port,
|
||||
) = self.get_hostname_and_port()
|
||||
|
||||
self.template_vars = dict(
|
||||
certs_dir=certs_dir(),
|
||||
@ -453,13 +379,6 @@ class SableController(BaseServerController, DirectoryBasedController):
|
||||
services_management_hostname=services_management_hostname,
|
||||
services_management_port=services_management_port,
|
||||
services_alias_users=SERVICES_ALIAS_USERS if run_services else "",
|
||||
history_hostname=history_hostname,
|
||||
history_port=history_port,
|
||||
history_cert_sha1=(certs_dir() / "My.Little.History.pem.sha1")
|
||||
.read_text()
|
||||
.strip(),
|
||||
history_management_hostname=history_management_hostname,
|
||||
history_management_port=history_management_port,
|
||||
)
|
||||
|
||||
with self.open_file("configs/network.conf") as fd:
|
||||
@ -475,7 +394,7 @@ class SableController(BaseServerController, DirectoryBasedController):
|
||||
else:
|
||||
faketime_cmd = []
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
*faketime_cmd,
|
||||
"sable_ircd",
|
||||
@ -490,28 +409,17 @@ class SableController(BaseServerController, DirectoryBasedController):
|
||||
cwd=self.directory,
|
||||
preexec_fn=os.setsid,
|
||||
env={"RUST_BACKTRACE": "1", **os.environ},
|
||||
proc_name="sable_ircd ",
|
||||
)
|
||||
self.pgroup_id = os.getpgid(self.proc.pid)
|
||||
|
||||
if run_services:
|
||||
self.services_controller = SableServicesController(self.test_config, self)
|
||||
self.services_controller.faketime_cmd = faketime_cmd
|
||||
self.services_controller.run(
|
||||
protocol="sable",
|
||||
server_hostname=services_hostname,
|
||||
server_port=services_port,
|
||||
)
|
||||
|
||||
if self.test_config.sable_history_server:
|
||||
self.history_controller = SableHistoryController(self.test_config, self)
|
||||
self.history_controller.faketime_cmd = faketime_cmd
|
||||
self.history_controller.run(
|
||||
protocol="sable",
|
||||
server_hostname=history_hostname,
|
||||
server_port=history_port,
|
||||
)
|
||||
|
||||
def kill_proc(self) -> None:
|
||||
os.killpg(self.pgroup_id, signal.SIGKILL)
|
||||
super().kill_proc()
|
||||
@ -555,62 +463,11 @@ class SableController(BaseServerController, DirectoryBasedController):
|
||||
case.sendLine(client, "QUIT")
|
||||
case.assertDisconnected(client)
|
||||
|
||||
def wait_for_services(self) -> None:
|
||||
# FIXME: this isn't called when sable_history is enabled but sable_services
|
||||
# isn't. This doesn't happen with the existing tests so this isn't an issue yet
|
||||
if self.services_controller is not None:
|
||||
t1 = threading.Thread(target=self.services_controller.wait_for_services)
|
||||
t1.start()
|
||||
if self.history_controller is not None:
|
||||
t2 = threading.Thread(target=self.history_controller.wait_for_services)
|
||||
t2.start()
|
||||
t2.join()
|
||||
if self.services_controller is not None:
|
||||
t1.join()
|
||||
|
||||
|
||||
class SableServicesController(BaseServicesController):
|
||||
server_controller: SableController
|
||||
software_name = "Sable Services"
|
||||
|
||||
faketime_cmd: Sequence[str]
|
||||
|
||||
def wait_for_services(self) -> None:
|
||||
"""Overrides the default implementation, as it relies on
|
||||
``PRIVMSG NickServ: HELP``, which always succeeds on Sable.
|
||||
|
||||
Instead, this relies on SASL PLAIN availability."""
|
||||
if self.services_up:
|
||||
# Don't check again if they are already available
|
||||
return
|
||||
self.server_controller.wait_for_port()
|
||||
|
||||
c = ClientMock(name="chkSASL", show_io=True)
|
||||
c.connect(self.server_controller.hostname, self.server_controller.port)
|
||||
|
||||
def wait() -> None:
|
||||
while True:
|
||||
c.sendLine("CAP LS 302")
|
||||
for msg in c.getMessages(synchronize=False):
|
||||
if msg.command == "CAP":
|
||||
assert msg.params[-2] == "LS", msg
|
||||
for cap in msg.params[-1].split():
|
||||
if cap.startswith("sasl="):
|
||||
mechanisms = cap.split("=", 1)[1].split(",")
|
||||
if "PLAIN" in mechanisms:
|
||||
return
|
||||
else:
|
||||
if msg.params[0] == "*":
|
||||
# End of CAP LS
|
||||
time.sleep(self.server_controller.sync_sleep_time)
|
||||
|
||||
wait()
|
||||
|
||||
c.sendLine("QUIT")
|
||||
c.getMessages()
|
||||
c.disconnect()
|
||||
self.services_up = True
|
||||
|
||||
def run(self, protocol: str, server_hostname: str, server_port: int) -> None:
|
||||
assert protocol == "sable"
|
||||
assert self.server_controller.directory is not None
|
||||
@ -618,9 +475,8 @@ class SableServicesController(BaseServicesController):
|
||||
with self.server_controller.open_file("configs/services.conf") as fd:
|
||||
fd.write(SERVICES_CONFIG % self.server_controller.template_vars)
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
*self.faketime_cmd,
|
||||
"sable_services",
|
||||
"--foreground",
|
||||
"--server-conf",
|
||||
@ -631,7 +487,6 @@ class SableServicesController(BaseServicesController):
|
||||
cwd=self.server_controller.directory,
|
||||
preexec_fn=os.setsid,
|
||||
env={"RUST_BACKTRACE": "1", **os.environ},
|
||||
proc_name="sable_services",
|
||||
)
|
||||
self.pgroup_id = os.getpgid(self.proc.pid)
|
||||
|
||||
@ -640,92 +495,5 @@ class SableServicesController(BaseServicesController):
|
||||
super().kill_proc()
|
||||
|
||||
|
||||
class SableHistoryController(BaseServicesController):
|
||||
server_controller: SableController
|
||||
software_name = "Sable History Server"
|
||||
faketime_cmd: Sequence[str]
|
||||
|
||||
def run(self, protocol: str, server_hostname: str, server_port: int) -> None:
|
||||
assert protocol == "sable"
|
||||
assert self.server_controller.directory is not None
|
||||
history_db_url = os.environ.get("PIFPAF_POSTGRESQL_URL") or os.environ.get(
|
||||
"IRCTEST_POSTGRESQL_URL"
|
||||
)
|
||||
assert history_db_url, (
|
||||
"Cannot find a postgresql database to use as backend for sable_history. "
|
||||
"Either set the IRCTEST_POSTGRESQL_URL env var to a libpq URL, or "
|
||||
"run `pip3 install pifpaf` and wrap irctest in a pifpaf call (ie. "
|
||||
"pifpaf run postgresql -- pytest --controller=irctest.controllers.sable ...)"
|
||||
)
|
||||
|
||||
with self.server_controller.open_file("configs/history_server.conf") as fd:
|
||||
vals = dict(self.server_controller.template_vars)
|
||||
vals["history_db_url"] = history_db_url
|
||||
fd.write(HISTORY_SERVER_CONFIG % vals)
|
||||
|
||||
self.proc = self.execute(
|
||||
[
|
||||
*self.faketime_cmd,
|
||||
"sable_history",
|
||||
"--foreground",
|
||||
"--server-conf",
|
||||
self.server_controller.directory / "configs/history_server.conf",
|
||||
"--network-conf",
|
||||
self.server_controller.directory / "configs/network.conf",
|
||||
],
|
||||
cwd=self.server_controller.directory,
|
||||
preexec_fn=os.setsid,
|
||||
env={"RUST_BACKTRACE": "1", **os.environ},
|
||||
proc_name="sable_history ",
|
||||
)
|
||||
self.pgroup_id = os.getpgid(self.proc.pid)
|
||||
|
||||
def wait_for_services(self) -> None:
|
||||
"""Overrides the default implementation, as it relies on
|
||||
``PRIVMSG NickServ: HELP``, which always succeeds on Sable.
|
||||
|
||||
Instead, this relies on SASL PLAIN availability."""
|
||||
if self.services_up:
|
||||
# Don't check again if they are already available
|
||||
return
|
||||
self.server_controller.wait_for_port()
|
||||
|
||||
c = ClientMock(name="chkHist", show_io=True)
|
||||
c.connect(self.server_controller.hostname, self.server_controller.port)
|
||||
c.sendLine("NICK chkHist")
|
||||
c.sendLine("USER chk chk chk chk")
|
||||
time.sleep(self.server_controller.sync_sleep_time)
|
||||
got_end_of_motd = False
|
||||
while not got_end_of_motd:
|
||||
for msg in c.getMessages(synchronize=False):
|
||||
if msg.command == "PING":
|
||||
c.sendLine("PONG :" + msg.params[0])
|
||||
if msg.command in ("376", "422"): # RPL_ENDOFMOTD / ERR_NOMOTD
|
||||
got_end_of_motd = True
|
||||
|
||||
def wait() -> None:
|
||||
timeout = time.time() + 10
|
||||
while time.time() < timeout:
|
||||
c.sendLine("LINKS")
|
||||
time.sleep(self.server_controller.sync_sleep_time)
|
||||
for msg in c.getMessages(synchronize=False):
|
||||
if msg.command == "364": # RPL_LINKS
|
||||
if msg.params[2] == "My.Little.History":
|
||||
return
|
||||
|
||||
raise Exception("History server is not available")
|
||||
|
||||
wait()
|
||||
|
||||
c.sendLine("QUIT")
|
||||
c.getMessages()
|
||||
c.disconnect()
|
||||
self.services_up = True
|
||||
|
||||
def kill_proc(self) -> None:
|
||||
os.killpg(self.pgroup_id, signal.SIGKILL)
|
||||
super().kill_proc()
|
||||
|
||||
|
||||
def get_irctest_controller_class() -> Type[SableController]:
|
||||
return SableController
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import shutil
|
||||
import subprocess
|
||||
from typing import Optional, Type
|
||||
|
||||
from irctest.basecontrollers import (
|
||||
@ -95,7 +96,7 @@ class SnircdController(BaseServerController, DirectoryBasedController):
|
||||
else:
|
||||
faketime_cmd = []
|
||||
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
*faketime_cmd,
|
||||
"ircd",
|
||||
@ -105,6 +106,7 @@ class SnircdController(BaseServerController, DirectoryBasedController):
|
||||
"-x",
|
||||
"DEBUG",
|
||||
],
|
||||
# stderr=subprocess.DEVNULL,
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import tempfile
|
||||
from typing import Optional, TextIO, Type, cast
|
||||
|
||||
@ -72,7 +73,7 @@ class SopelController(BaseClientController):
|
||||
auth_method="auth_method = sasl" if auth else "",
|
||||
)
|
||||
)
|
||||
self.proc = self.execute(["sopel", "-c", self.filename])
|
||||
self.proc = subprocess.Popen(["sopel", "-c", self.filename])
|
||||
|
||||
|
||||
def get_irctest_controller_class() -> Type[SopelController]:
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
from typing import Optional, Type
|
||||
|
||||
from irctest import authentication, tls
|
||||
@ -95,7 +96,7 @@ class TheLoungeController(BaseClientController, DirectoryBasedController):
|
||||
)
|
||||
with self.open_file("users/testuser.json", "r") as fd:
|
||||
print("config", json.load(fd)["networks"][0]["saslPassword"])
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[os.environ.get("THELOUNGE_BIN", "thelounge"), "start"],
|
||||
env={**os.environ, "THELOUNGE_HOME": str(self.directory)},
|
||||
)
|
||||
|
||||
@ -261,7 +261,7 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
|
||||
faketime_cmd = []
|
||||
|
||||
with _STARTSTOP_LOCK():
|
||||
self.proc = self.execute(
|
||||
self.proc = subprocess.Popen(
|
||||
[
|
||||
*faketime_cmd,
|
||||
"unrealircd",
|
||||
@ -270,6 +270,7 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
|
||||
"-f",
|
||||
self.directory / "unrealircd.conf",
|
||||
],
|
||||
# stdout=subprocess.DEVNULL,
|
||||
)
|
||||
self.wait_for_port()
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
`IRCv3 draft chathistory <https://ircv3.net/specs/extensions/chathistory>`_
|
||||
"""
|
||||
|
||||
import dataclasses
|
||||
import functools
|
||||
import secrets
|
||||
import time
|
||||
@ -32,22 +31,10 @@ def skip_ngircd(f):
|
||||
return newf
|
||||
|
||||
|
||||
class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
def _wait_before_chathistory(self):
|
||||
"""Hook for the Sable-specific tests that check the postgresql-based
|
||||
CHATHISTORY implementation is sound. This implementation only kicks in
|
||||
after the in-memory history is cleared, which happens after a 5 min timeout;
|
||||
and this gives a chance to :class:``SablePostgresqlHistoryTestCase`` to
|
||||
wait this timeout.
|
||||
|
||||
For other tests, this does nothing.
|
||||
"""
|
||||
raise NotImplementedError("_BaseChathistoryTests._wait_before_chathistory")
|
||||
|
||||
def validate_chathistory_batch(self, user, target):
|
||||
# may need to try again for Sable, as it has a pretty high latency here
|
||||
while not (msgs := self.getMessages(user)):
|
||||
pass
|
||||
@cases.mark_specifications("IRCv3")
|
||||
@cases.mark_services
|
||||
class ChathistoryTestCase(cases.BaseServerTestCase):
|
||||
def validate_chathistory_batch(self, msgs, target):
|
||||
(start, *inner_msgs, end) = msgs
|
||||
|
||||
self.assertMessageMatch(
|
||||
@ -107,13 +94,9 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
self.joinChannel(qux, real_chname)
|
||||
self.getMessages(qux)
|
||||
|
||||
self._wait_before_chathistory()
|
||||
|
||||
# test a nonexistent channel
|
||||
self.sendLine(bar, "CHATHISTORY LATEST #nonexistent_channel * 10")
|
||||
while not (msgs := self.getMessages(bar)):
|
||||
# need to retry when Sable has the history server on
|
||||
pass
|
||||
msgs = self.getMessages(bar)
|
||||
msgs = [msg for msg in msgs if msg.command != "MODE"] # :NickServ MODE +r
|
||||
self.assertMessageMatch(
|
||||
msgs[0],
|
||||
@ -123,9 +106,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
|
||||
# as should a real channel to which one is not joined:
|
||||
self.sendLine(bar, "CHATHISTORY LATEST %s * 10" % (real_chname,))
|
||||
while not (msgs := self.getMessages(bar)):
|
||||
# need to retry when Sable has the history server on
|
||||
pass
|
||||
msgs = self.getMessages(bar)
|
||||
self.assertMessageMatch(
|
||||
msgs[0],
|
||||
command="FAIL",
|
||||
@ -194,8 +175,6 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
messages.append(echo.to_history_message())
|
||||
self.assertEqual(echo.to_history_message(), delivery.to_history_message())
|
||||
|
||||
self._wait_before_chathistory()
|
||||
|
||||
self.sendLine(bar, "CHATHISTORY LATEST %s * 10" % (bar,))
|
||||
replies = [msg for msg in self.getMessages(bar) if msg.command == "PRIVMSG"]
|
||||
self.assertEqual([msg.to_history_message() for msg in replies], messages)
|
||||
@ -246,12 +225,9 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
echo_messages.extend(
|
||||
msg.to_history_message() for msg in self.getMessages(1)
|
||||
)
|
||||
time.sleep(0.02)
|
||||
time.sleep(0.002)
|
||||
|
||||
self.validate_echo_messages(NUM_MESSAGES, echo_messages)
|
||||
|
||||
self._wait_before_chathistory()
|
||||
|
||||
self.validate_chathistory(subcommand, echo_messages, 1, chname)
|
||||
|
||||
@skip_ngircd
|
||||
@ -288,8 +264,6 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
)
|
||||
time.sleep(0.002)
|
||||
|
||||
self._wait_before_chathistory()
|
||||
|
||||
self.validate_echo_messages(NUM_MESSAGES, echo_messages)
|
||||
self.sendLine(1, "CHATHISTORY LATEST %s * 100" % chname)
|
||||
(batch_open, *messages, batch_close) = self.getMessages(1)
|
||||
@ -334,9 +308,6 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
time.sleep(0.002)
|
||||
|
||||
self.validate_echo_messages(NUM_MESSAGES * 2, echo_messages)
|
||||
|
||||
self._wait_before_chathistory()
|
||||
|
||||
self.validate_chathistory(subcommand, echo_messages, 1, chname)
|
||||
|
||||
@pytest.mark.parametrize("subcommand", SUBCOMMANDS)
|
||||
@ -396,9 +367,6 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
self.getMessages(2)
|
||||
|
||||
self.validate_echo_messages(NUM_MESSAGES, echo_messages)
|
||||
|
||||
self._wait_before_chathistory()
|
||||
|
||||
self.validate_chathistory(subcommand, echo_messages, 1, c2)
|
||||
self.validate_chathistory(subcommand, echo_messages, 2, c1)
|
||||
|
||||
@ -447,8 +415,6 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
]
|
||||
self.assertEqual(results, new_convo)
|
||||
|
||||
self._wait_before_chathistory()
|
||||
|
||||
# additional messages with c3 should not show up in the c1-c2 history:
|
||||
self.validate_chathistory(subcommand, echo_messages, 1, c2)
|
||||
self.validate_chathistory(subcommand, echo_messages, 2, c1)
|
||||
@ -493,15 +459,15 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
def _validate_chathistory_LATEST(self, echo_messages, user, chname):
|
||||
INCLUSIVE_LIMIT = len(echo_messages) * 2
|
||||
self.sendLine(user, "CHATHISTORY LATEST %s * %d" % (chname, INCLUSIVE_LIMIT))
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages, result)
|
||||
|
||||
self.sendLine(user, "CHATHISTORY LATEST %s * %d" % (chname, 5))
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[-5:], result)
|
||||
|
||||
self.sendLine(user, "CHATHISTORY LATEST %s * %d" % (chname, 1))
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[-1:], result)
|
||||
|
||||
if self._supports_msgid():
|
||||
@ -510,7 +476,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY LATEST %s msgid=%s %d"
|
||||
% (chname, echo_messages[4].msgid, INCLUSIVE_LIMIT),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[5:], result)
|
||||
|
||||
if self._supports_timestamp():
|
||||
@ -519,7 +485,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY LATEST %s timestamp=%s %d"
|
||||
% (chname, echo_messages[4].time, INCLUSIVE_LIMIT),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[5:], result)
|
||||
|
||||
def _validate_chathistory_BEFORE(self, echo_messages, user, chname):
|
||||
@ -530,7 +496,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY BEFORE %s msgid=%s %d"
|
||||
% (chname, echo_messages[6].msgid, INCLUSIVE_LIMIT),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[:6], result)
|
||||
|
||||
if self._supports_timestamp():
|
||||
@ -539,7 +505,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY BEFORE %s timestamp=%s %d"
|
||||
% (chname, echo_messages[6].time, INCLUSIVE_LIMIT),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[:6], result)
|
||||
|
||||
self.sendLine(
|
||||
@ -547,7 +513,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY BEFORE %s timestamp=%s %d"
|
||||
% (chname, echo_messages[6].time, 2),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[4:6], result)
|
||||
|
||||
def _validate_chathistory_AFTER(self, echo_messages, user, chname):
|
||||
@ -558,7 +524,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY AFTER %s msgid=%s %d"
|
||||
% (chname, echo_messages[3].msgid, INCLUSIVE_LIMIT),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[4:], result)
|
||||
|
||||
if self._supports_timestamp():
|
||||
@ -567,7 +533,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY AFTER %s timestamp=%s %d"
|
||||
% (chname, echo_messages[3].time, INCLUSIVE_LIMIT),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[4:], result)
|
||||
|
||||
self.sendLine(
|
||||
@ -575,7 +541,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY AFTER %s timestamp=%s %d"
|
||||
% (chname, echo_messages[3].time, 3),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[4:7], result)
|
||||
|
||||
def _validate_chathistory_BETWEEN(self, echo_messages, user, chname):
|
||||
@ -592,7 +558,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
INCLUSIVE_LIMIT,
|
||||
),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[1:-1], result)
|
||||
|
||||
self.sendLine(
|
||||
@ -605,7 +571,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
INCLUSIVE_LIMIT,
|
||||
),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[1:-1], result)
|
||||
|
||||
# BETWEEN forwards and backwards with a limit, should get
|
||||
@ -615,7 +581,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY BETWEEN %s msgid=%s msgid=%s %d"
|
||||
% (chname, echo_messages[0].msgid, echo_messages[-1].msgid, 3),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[1:4], result)
|
||||
|
||||
self.sendLine(
|
||||
@ -623,7 +589,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY BETWEEN %s msgid=%s msgid=%s %d"
|
||||
% (chname, echo_messages[-1].msgid, echo_messages[0].msgid, 3),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[-4:-1], result)
|
||||
|
||||
if self._supports_timestamp():
|
||||
@ -638,7 +604,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
INCLUSIVE_LIMIT,
|
||||
),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[1:-1], result)
|
||||
self.sendLine(
|
||||
user,
|
||||
@ -650,21 +616,21 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
INCLUSIVE_LIMIT,
|
||||
),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[1:-1], result)
|
||||
self.sendLine(
|
||||
user,
|
||||
"CHATHISTORY BETWEEN %s timestamp=%s timestamp=%s %d"
|
||||
% (chname, echo_messages[0].time, echo_messages[-1].time, 3),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[1:4], result)
|
||||
self.sendLine(
|
||||
user,
|
||||
"CHATHISTORY BETWEEN %s timestamp=%s timestamp=%s %d"
|
||||
% (chname, echo_messages[-1].time, echo_messages[0].time, 3),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[-4:-1], result)
|
||||
|
||||
def _validate_chathistory_AROUND(self, echo_messages, user, chname):
|
||||
@ -674,7 +640,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY AROUND %s msgid=%s %d"
|
||||
% (chname, echo_messages[7].msgid, 1),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual([echo_messages[7]], result)
|
||||
|
||||
self.sendLine(
|
||||
@ -682,7 +648,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY AROUND %s msgid=%s %d"
|
||||
% (chname, echo_messages[7].msgid, 3),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertEqual(echo_messages[6:9], result)
|
||||
|
||||
if self._supports_timestamp():
|
||||
@ -691,7 +657,7 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
"CHATHISTORY AROUND %s timestamp=%s %d"
|
||||
% (chname, echo_messages[7].time, 3),
|
||||
)
|
||||
result = self.validate_chathistory_batch(user, chname)
|
||||
result = self.validate_chathistory_batch(self.getMessages(user), chname)
|
||||
self.assertIn(echo_messages[7], result)
|
||||
|
||||
@pytest.mark.arbitrary_client_tags
|
||||
@ -752,8 +718,6 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
self.assertEqual(len(relay), 1)
|
||||
validate_tagmsg(relay[0], chname, msgid)
|
||||
|
||||
self._wait_before_chathistory()
|
||||
|
||||
self.sendLine(1, "CHATHISTORY LATEST %s * 10" % (chname,))
|
||||
history_tagmsgs = [
|
||||
msg for msg in self.getMessages(1) if msg.command == "TAGMSG"
|
||||
@ -850,95 +814,8 @@ class _BaseChathistoryTests(cases.BaseServerTestCase):
|
||||
validate_msg(relay)
|
||||
|
||||
|
||||
@cases.mark_specifications("IRCv3")
|
||||
@cases.mark_services
|
||||
class ChathistoryTestCase(_BaseChathistoryTests):
|
||||
def _wait_before_chathistory(self):
|
||||
"""does nothing"""
|
||||
pass
|
||||
|
||||
|
||||
assert {f"_validate_chathistory_{cmd}" for cmd in SUBCOMMANDS} == {
|
||||
meth_name
|
||||
for meth_name in dir(ChathistoryTestCase)
|
||||
if meth_name.startswith("_validate_chathistory_")
|
||||
}, "ChathistoryTestCase.validate_chathistory and SUBCOMMANDS are out of sync"
|
||||
|
||||
|
||||
@cases.mark_specifications("Sable")
|
||||
@cases.mark_services
|
||||
class SablePostgresqlHistoryTestCase(_BaseChathistoryTests):
|
||||
# for every wall clock second, 15 seconds pass for the server.
|
||||
# at x30, links between nodes timeout.
|
||||
faketime = "+1y x15"
|
||||
|
||||
@staticmethod
|
||||
def config() -> cases.TestCaseControllerConfig:
|
||||
return dataclasses.replace( # type: ignore[no-any-return]
|
||||
_BaseChathistoryTests.config(),
|
||||
sable_history_server=True,
|
||||
)
|
||||
|
||||
def _wait_before_chathistory(self):
|
||||
"""waits 6 seconds which appears to be a 1.5 min to Sable; which goes over
|
||||
the 1 min timeout for in-memory history (+ 1 min because the cleanup job
|
||||
only runs every min)"""
|
||||
assert self.controller.faketime_enabled, "faketime is not installed"
|
||||
time.sleep(8)
|
||||
|
||||
|
||||
@cases.mark_specifications("Sable")
|
||||
@cases.mark_services
|
||||
class SableExpiringHistoryTestCase(cases.BaseServerTestCase):
|
||||
faketime = "+1y x15"
|
||||
|
||||
def _wait_before_chathistory(self):
|
||||
"""waits 6 seconds which appears to be a 1.5 min to Sable; which goes over
|
||||
the 1 min timeout for in-memory history (+ 1 min because the cleanup job
|
||||
only runs every min)"""
|
||||
assert self.controller.faketime_enabled, "faketime is not installed"
|
||||
time.sleep(8)
|
||||
|
||||
def testChathistoryExpired(self):
|
||||
"""Checks that Sable forgets about messages if the history server is not available"""
|
||||
self.connectClient(
|
||||
"bar",
|
||||
capabilities=[
|
||||
"message-tags",
|
||||
"server-time",
|
||||
"echo-message",
|
||||
"batch",
|
||||
"labeled-response",
|
||||
"sasl",
|
||||
CHATHISTORY_CAP,
|
||||
],
|
||||
skip_if_cap_nak=True,
|
||||
)
|
||||
chname = "#chan" + secrets.token_hex(12)
|
||||
self.joinChannel(1, chname)
|
||||
self.getMessages(1)
|
||||
self.getMessages(1)
|
||||
|
||||
self.sendLine(1, f"PRIVMSG {chname} :this is a message")
|
||||
self.getMessages(1)
|
||||
|
||||
self._wait_before_chathistory()
|
||||
|
||||
self.sendLine(1, f"CHATHISTORY LATEST {chname} * 10")
|
||||
|
||||
while not (messages := self.getMessages(1)):
|
||||
# Sable processes CHATHISTORY asynchronously, which can be pretty slow as it
|
||||
# sends cross-server requests. This means we can't just rely on a PING-PONG
|
||||
# or the usual time.sleep(self.controller.sync_sleep_time) to make sure
|
||||
# the ircd replied to us
|
||||
time.sleep(self.controller.sync_sleep_time)
|
||||
|
||||
(start, *middle, end) = messages
|
||||
self.assertMessageMatch(
|
||||
start, command="BATCH", params=[StrRe(r"\+.*"), "chathistory", chname]
|
||||
)
|
||||
batch_tag = start.params[0][1:]
|
||||
self.assertMessageMatch(end, command="BATCH", params=["-" + batch_tag])
|
||||
self.assertEqual(
|
||||
len(middle), 0, f"Got messages that should be expired: {middle}"
|
||||
)
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
from irctest import cases
|
||||
from irctest.numerics import RPL_CHANNELCREATED, RPL_CHANNELMODEIS
|
||||
from irctest.patma import ANYSTR, ListRemainder, StrRe
|
||||
|
||||
|
||||
class RplChannelModeIsTestCase(cases.BaseServerTestCase):
|
||||
@cases.mark_specifications("Modern")
|
||||
def testChannelModeIs(self):
|
||||
"""Test RPL_CHANNELMODEIS and RPL_CHANNELCREATED as responses to
|
||||
`MODE #channel`:
|
||||
<https://modern.ircdocs.horse/#rplcreationtime-329>
|
||||
<https://modern.ircdocs.horse/#rplchannelmodeis-324>
|
||||
"""
|
||||
expected_numerics = {RPL_CHANNELMODEIS, RPL_CHANNELCREATED}
|
||||
if self.controller.software_name in ("irc2", "Sable"):
|
||||
# irc2 and Sable don't use timestamps for conflict resolution,
|
||||
# consequently they don't store the channel creation timestamp
|
||||
# and don't send RPL_CHANNELCREATED
|
||||
expected_numerics = {RPL_CHANNELMODEIS}
|
||||
|
||||
self.connectClient("chanop", name="chanop")
|
||||
self.joinChannel("chanop", "#chan")
|
||||
# i, n, and t are specified by RFC1459; some of them may be on by default,
|
||||
# but after this, at least those three should be enabled:
|
||||
self.sendLine("chanop", "MODE #chan +int")
|
||||
self.getMessages("chanop")
|
||||
|
||||
self.sendLine("chanop", "MODE #chan")
|
||||
messages = self.getMessages("chanop")
|
||||
self.assertEqual(expected_numerics, {msg.command for msg in messages})
|
||||
for message in messages:
|
||||
if message.command == RPL_CHANNELMODEIS:
|
||||
# the final parameters are the mode string (e.g. `+int`),
|
||||
# and then optionally any mode parameters (in case the ircd
|
||||
# lists a mode that takes a parameter)
|
||||
self.assertMessageMatch(
|
||||
message,
|
||||
command=RPL_CHANNELMODEIS,
|
||||
params=["chanop", "#chan", ListRemainder(ANYSTR, min_length=1)],
|
||||
)
|
||||
final_param = message.params[2]
|
||||
self.assertEqual(final_param[0], "+")
|
||||
enabled_modes = list(final_param[1:])
|
||||
break
|
||||
|
||||
self.assertLessEqual({"i", "n", "t"}, set(enabled_modes))
|
||||
|
||||
# remove all the modes listed by RPL_CHANNELMODEIS
|
||||
self.sendLine("chanop", f"MODE #chan -{''.join(enabled_modes)}")
|
||||
response = self.getMessage("chanop")
|
||||
# we should get something like: MODE #chan -int
|
||||
self.assertMessageMatch(
|
||||
response, command="MODE", params=["#chan", StrRe("^-.*")]
|
||||
)
|
||||
self.assertEqual(set(response.params[1][1:]), set(enabled_modes))
|
||||
|
||||
self.sendLine("chanop", "MODE #chan")
|
||||
messages = self.getMessages("chanop")
|
||||
self.assertEqual(expected_numerics, {msg.command for msg in messages})
|
||||
# all modes have been disabled; the correct representation of this is `+`
|
||||
for message in messages:
|
||||
if message.command == RPL_CHANNELMODEIS:
|
||||
self.assertMessageMatch(
|
||||
message,
|
||||
command=RPL_CHANNELMODEIS,
|
||||
params=["chanop", "#chan", "+"],
|
||||
)
|
||||
@ -1,159 +0,0 @@
|
||||
from irctest import cases
|
||||
from irctest.numerics import (
|
||||
ERR_CHANOPRIVSNEEDED,
|
||||
ERR_NOSUCHCHANNEL,
|
||||
ERR_NOSUCHNICK,
|
||||
ERR_NOTONCHANNEL,
|
||||
ERR_USERNOTINCHANNEL,
|
||||
)
|
||||
|
||||
|
||||
class ChannelOperatorModeTestCase(cases.BaseServerTestCase):
|
||||
"""Test various error and success cases around the channel operator mode:
|
||||
<https://modern.ircdocs.horse/#channel-operators>
|
||||
<https://modern.ircdocs.horse/#mode-message>
|
||||
"""
|
||||
|
||||
def setupNicks(self):
|
||||
"""Set up a standard set of three nicknames and two channels
|
||||
for testing channel-user MODE interactions."""
|
||||
# first nick to join the channel is privileged:
|
||||
self.connectClient("chanop", name="chanop")
|
||||
self.joinChannel("chanop", "#chan")
|
||||
|
||||
self.connectClient("unprivileged", name="unprivileged")
|
||||
self.joinChannel("unprivileged", "#chan")
|
||||
self.getMessages("chanop")
|
||||
|
||||
self.connectClient("unrelated", name="unrelated")
|
||||
self.joinChannel("unrelated", "#unrelated")
|
||||
self.joinChannel("unprivileged", "#unrelated")
|
||||
self.getMessages("unrelated")
|
||||
|
||||
@cases.mark_specifications("Modern")
|
||||
@cases.xfailIfSoftware(["irc2"], "broken in irc2")
|
||||
def testChannelOperatorModeSenderPrivsNeeded(self):
|
||||
"""Test that +o from a channel member without the necessary privileges
|
||||
fails as expected."""
|
||||
self.setupNicks()
|
||||
# sender is a channel member but without the necessary privileges:
|
||||
self.sendLine("unprivileged", "MODE #chan +o unprivileged")
|
||||
messages = self.getMessages("unprivileged")
|
||||
self.assertEqual(len(messages), 1)
|
||||
self.assertMessageMatch(messages[0], command=ERR_CHANOPRIVSNEEDED)
|
||||
|
||||
@cases.mark_specifications("Modern")
|
||||
def testChannelOperatorModeTargetNotInChannel(self):
|
||||
"""Test that +o targeting a user not present in the channel fails
|
||||
as expected."""
|
||||
self.setupNicks()
|
||||
# sender is a chanop, but target nick is not in the channel:
|
||||
self.sendLine("chanop", "MODE #chan +o unrelated")
|
||||
messages = self.getMessages("chanop")
|
||||
self.assertEqual(len(messages), 1)
|
||||
self.assertMessageMatch(messages[0], command=ERR_USERNOTINCHANNEL)
|
||||
|
||||
@cases.mark_specifications("Modern")
|
||||
def testChannelOperatorModeTargetDoesNotExist(self):
|
||||
"""Test that +o targeting a nonexistent nick fails as expected."""
|
||||
self.setupNicks()
|
||||
# sender is a chanop, but target nick does not exist:
|
||||
self.sendLine("chanop", "MODE #chan +o nobody")
|
||||
messages = self.getMessages("chanop")
|
||||
# ERR_NOSUCHNICK is typical, Bahamut additionally sends ERR_USERNOTINCHANNEL
|
||||
if self.controller.software_name != "Bahamut":
|
||||
self.assertEqual(len(messages), 1)
|
||||
self.assertMessageMatch(messages[0], command=ERR_NOSUCHNICK)
|
||||
else:
|
||||
self.assertLessEqual(len(messages), 2)
|
||||
commands = {message.command for message in messages}
|
||||
self.assertLessEqual({ERR_NOSUCHNICK}, commands)
|
||||
self.assertLessEqual(commands, {ERR_NOSUCHNICK, ERR_USERNOTINCHANNEL})
|
||||
|
||||
@cases.mark_specifications("Modern")
|
||||
@cases.xfailIf(
|
||||
lambda self: bool(
|
||||
self.controller.software_name == "UnrealIRCd"
|
||||
and self.controller.software_version == 5
|
||||
),
|
||||
"UnrealIRCd <6.1.7 returns ERR_NOSUCHNICK on non-existent channel",
|
||||
)
|
||||
def testChannelOperatorModeChannelDoesNotExist(self):
|
||||
"""Test that +o targeting a nonexistent channel fails as expected.
|
||||
|
||||
"If <target> is a channel that does not exist on the network,
|
||||
# the ERR_NOSUCHCHANNEL (403) numeric is returned."
|
||||
"""
|
||||
self.setupNicks()
|
||||
# target channel does not exist, but target nick does:
|
||||
self.sendLine("chanop", "MODE #nonexistentchan +o chanop")
|
||||
messages = self.getMessages("chanop")
|
||||
self.assertEqual(len(messages), 1)
|
||||
self.assertMessageMatch(messages[0], command=ERR_NOSUCHCHANNEL)
|
||||
|
||||
@cases.mark_specifications("Modern")
|
||||
@cases.xfailIf(
|
||||
lambda self: bool(
|
||||
self.controller.software_name == "UnrealIRCd"
|
||||
and self.controller.software_version == 5
|
||||
),
|
||||
"UnrealIRCd <6.1.7 returns ERR_NOSUCHNICK on non-existent channel",
|
||||
)
|
||||
def testChannelOperatorModeChannelAndTargetDoNotExist(self):
|
||||
"""Test that +o targeting a nonexistent channel and nickname
|
||||
fails as expected."""
|
||||
self.setupNicks()
|
||||
# neither target channel nor target nick exist:
|
||||
self.sendLine("chanop", "MODE #nonexistentchan +o nobody")
|
||||
messages = self.getMessages("chanop")
|
||||
self.assertEqual(len(messages), 1)
|
||||
self.assertIn(
|
||||
messages[0].command,
|
||||
[ERR_NOSUCHCHANNEL, ERR_NOTONCHANNEL, ERR_USERNOTINCHANNEL],
|
||||
)
|
||||
|
||||
@cases.mark_specifications("Modern")
|
||||
def testChannelOperatorModeSenderNonMember(self):
|
||||
"""Test that +o where the sender is not a channel member
|
||||
fails as expected."""
|
||||
self.setupNicks()
|
||||
# sender is not a channel member, target nick exists and is a channel member:
|
||||
self.sendLine("chanop", "MODE #unrelated +o unprivileged")
|
||||
messages = self.getMessages("chanop")
|
||||
self.assertEqual(len(messages), 1)
|
||||
self.assertIn(messages[0].command, [ERR_NOTONCHANNEL, ERR_CHANOPRIVSNEEDED])
|
||||
|
||||
@cases.mark_specifications("Modern")
|
||||
def testChannelOperatorModeSenderAndTargetNonMembers(self):
|
||||
"""Test that +o where neither the sender nor the target is a channel
|
||||
member fails as expected."""
|
||||
self.setupNicks()
|
||||
# sender is not a channel member, target nick exists but is not a channel member:
|
||||
self.sendLine("chanop", "MODE #unrelated +o chanop")
|
||||
messages = self.getMessages("chanop")
|
||||
self.assertEqual(len(messages), 1)
|
||||
self.assertIn(
|
||||
messages[0].command,
|
||||
[ERR_NOTONCHANNEL, ERR_CHANOPRIVSNEEDED, ERR_USERNOTINCHANNEL],
|
||||
)
|
||||
|
||||
@cases.mark_specifications("Modern")
|
||||
def testChannelOperatorModeSuccess(self):
|
||||
"""Tests a successful grant of +o in a channel."""
|
||||
self.setupNicks()
|
||||
|
||||
self.sendLine("chanop", "MODE #chan +o unprivileged")
|
||||
messages = self.getMessages("chanop")
|
||||
self.assertEqual(len(messages), 1)
|
||||
self.assertMessageMatch(
|
||||
messages[0],
|
||||
command="MODE",
|
||||
params=["#chan", "+o", "unprivileged"],
|
||||
)
|
||||
messages = self.getMessages("unprivileged")
|
||||
self.assertEqual(len(messages), 1)
|
||||
self.assertMessageMatch(
|
||||
messages[0],
|
||||
command="MODE",
|
||||
params=["#chan", "+o", "unprivileged"],
|
||||
)
|
||||
@ -140,9 +140,9 @@ class TagsTestCase(cases.BaseServerTestCase):
|
||||
self.joinChannel(1, "#xyz")
|
||||
monsterMessage = "@+clientOnlyTagExample=" + "a" * 4096 + " PRIVMSG #xyz hi!"
|
||||
self.sendLine(1, monsterMessage)
|
||||
self.assertEqual(self.getMessages(2), [], "overflowing message was relayed")
|
||||
replies = self.getMessages(1)
|
||||
self.assertIn(ERR_INPUTTOOLONG, set(reply.command for reply in replies))
|
||||
self.assertEqual(self.getMessages(2), [], "overflowing message was relayed")
|
||||
|
||||
|
||||
class LengthLimitTestCase(cases.BaseServerTestCase):
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import base64
|
||||
from typing import List
|
||||
|
||||
from irctest import cases, runner, scram
|
||||
from irctest.numerics import ERR_SASLFAIL, RPL_LOGGEDIN, RPL_SASLMECHS
|
||||
@ -11,8 +12,34 @@ class RegistrationTestCase(cases.BaseServerTestCase):
|
||||
self.controller.registerUser(self, "testuser", "mypassword")
|
||||
|
||||
|
||||
@cases.mark_services
|
||||
class SaslTestCase(cases.BaseServerTestCase):
|
||||
class _BaseSasl(cases.BaseServerTestCase):
|
||||
sasl_ir: bool
|
||||
capabilities: List[str]
|
||||
|
||||
def _doInitialExchange(self, client, mechanism: str, chunk: str):
|
||||
"""Does the initial C->S, S->C, C->S exchange.
|
||||
|
||||
With ``sasl_ir=False``, this is done with the usual three messages exchange
|
||||
(``AUTHENTICATE <mechanism>``, ``AUTHENTICATE +``, ``AUTHENTICATE <chunk>``)
|
||||
with ``sasl_ir=True``, this is done in a single C->S message
|
||||
(``AUTHENTICATE <mechanism> <chunk>``)
|
||||
|
||||
See the [sasl-ir spec](https://github.com/ircv3/ircv3-specifications/pull/520)
|
||||
"""
|
||||
if self.sasl_ir:
|
||||
self.sendLine(client, f"AUTHENTICATE {mechanism} {chunk}")
|
||||
else:
|
||||
self.sendLine(client, f"AUTHENTICATE {mechanism}")
|
||||
m = self.getRegistrationMessage(1)
|
||||
self.assertMessageMatch(
|
||||
m,
|
||||
command="AUTHENTICATE",
|
||||
params=["+"],
|
||||
fail_msg=f"Sent “AUTHENTICATE {mechanism}”, server should have "
|
||||
f"replied with “AUTHENTICATE +”, but instead sent: {{msg}}",
|
||||
)
|
||||
self.sendLine(client, f"AUTHENTICATE {chunk}")
|
||||
|
||||
@cases.mark_specifications("IRCv3")
|
||||
@cases.skipUnlessHasMechanism("PLAIN")
|
||||
def testPlain(self):
|
||||
@ -34,17 +61,8 @@ class SaslTestCase(cases.BaseServerTestCase):
|
||||
capabilities["sasl"],
|
||||
fail_msg="Does not have PLAIN mechanism as the controller " "claims",
|
||||
)
|
||||
self.requestCapabilities(1, ["sasl"], skip_if_cap_nak=False)
|
||||
self.sendLine(1, "AUTHENTICATE PLAIN")
|
||||
m = self.getRegistrationMessage(1)
|
||||
self.assertMessageMatch(
|
||||
m,
|
||||
command="AUTHENTICATE",
|
||||
params=["+"],
|
||||
fail_msg="Sent “AUTHENTICATE PLAIN”, server should have "
|
||||
"replied with “AUTHENTICATE +”, but instead sent: {msg}",
|
||||
)
|
||||
self.sendLine(1, "AUTHENTICATE amlsbGVzAGppbGxlcwBzZXNhbWU=")
|
||||
self.requestCapabilities(1, self.capabilities, skip_if_cap_nak=False)
|
||||
self._doInitialExchange(1, "PLAIN", "amlsbGVzAGppbGxlcwBzZXNhbWU=")
|
||||
m = self.getRegistrationMessage(1)
|
||||
self.assertMessageMatch(
|
||||
m,
|
||||
@ -88,17 +106,8 @@ class SaslTestCase(cases.BaseServerTestCase):
|
||||
).decode()
|
||||
self.controller.registerUser(self, "foo", password)
|
||||
self.addClient()
|
||||
self.requestCapabilities(1, ["sasl"], skip_if_cap_nak=False)
|
||||
self.sendLine(1, "AUTHENTICATE PLAIN")
|
||||
m = self.getRegistrationMessage(1)
|
||||
self.assertMessageMatch(
|
||||
m,
|
||||
command="AUTHENTICATE",
|
||||
params=["+"],
|
||||
fail_msg="Sent “AUTHENTICATE PLAIN”, server should have "
|
||||
"replied with “AUTHENTICATE +”, but instead sent: {msg}",
|
||||
)
|
||||
self.sendLine(1, "AUTHENTICATE " + authstring)
|
||||
self.requestCapabilities(1, self.capabilities, skip_if_cap_nak=False)
|
||||
self._doInitialExchange(1, "PLAIN", authstring)
|
||||
m = self.getRegistrationMessage(1)
|
||||
self.assertMessageMatch(
|
||||
m,
|
||||
@ -148,17 +157,8 @@ class SaslTestCase(cases.BaseServerTestCase):
|
||||
capabilities["sasl"],
|
||||
fail_msg="Does not have PLAIN mechanism as the controller " "claims",
|
||||
)
|
||||
self.requestCapabilities(1, ["sasl"], skip_if_cap_nak=False)
|
||||
self.sendLine(1, "AUTHENTICATE PLAIN")
|
||||
m = self.getRegistrationMessage(1)
|
||||
self.assertMessageMatch(
|
||||
m,
|
||||
command="AUTHENTICATE",
|
||||
params=["+"],
|
||||
fail_msg="Sent “AUTHENTICATE PLAIN”, server should have "
|
||||
"replied with “AUTHENTICATE +”, but instead sent: {msg}",
|
||||
)
|
||||
self.sendLine(1, "AUTHENTICATE AGppbGxlcwBzZXNhbWU=")
|
||||
self.requestCapabilities(1, self.capabilities, skip_if_cap_nak=False)
|
||||
self._doInitialExchange(1, "PLAIN", "AGppbGxlcwBzZXNhbWU=")
|
||||
m = self.getRegistrationMessage(1)
|
||||
self.assertMessageMatch(
|
||||
m,
|
||||
@ -184,8 +184,11 @@ class SaslTestCase(cases.BaseServerTestCase):
|
||||
capabilities,
|
||||
fail_msg="Does not have SASL as the controller claims.",
|
||||
)
|
||||
self.requestCapabilities(1, ["sasl"], skip_if_cap_nak=False)
|
||||
self.sendLine(1, "AUTHENTICATE FOO")
|
||||
self.requestCapabilities(1, self.capabilities, skip_if_cap_nak=False)
|
||||
if self.sasl_ir:
|
||||
self.sendLine(1, "AUTHENTICATE FOO AGppbGxlcwBzZXNhbWU=")
|
||||
else:
|
||||
self.sendLine(1, "AUTHENTICATE FOO")
|
||||
m = self.getRegistrationMessage(1)
|
||||
while m.command == RPL_SASLMECHS:
|
||||
m = self.getRegistrationMessage(1)
|
||||
@ -235,17 +238,8 @@ class SaslTestCase(cases.BaseServerTestCase):
|
||||
capabilities["sasl"],
|
||||
fail_msg="Does not have PLAIN mechanism as the controller " "claims",
|
||||
)
|
||||
self.requestCapabilities(1, ["sasl"], skip_if_cap_nak=False)
|
||||
self.sendLine(1, "AUTHENTICATE PLAIN")
|
||||
m = self.getRegistrationMessage(1)
|
||||
self.assertMessageMatch(
|
||||
m,
|
||||
command="AUTHENTICATE",
|
||||
params=["+"],
|
||||
fail_msg="Sent “AUTHENTICATE PLAIN”, expected "
|
||||
"“AUTHENTICATE +” as a response, but got: {msg}",
|
||||
)
|
||||
self.sendLine(1, "AUTHENTICATE {}".format(authstring[0:400]))
|
||||
self.requestCapabilities(1, self.capabilities, skip_if_cap_nak=False)
|
||||
self._doInitialExchange(1, "PLAIN", authstring[0:400])
|
||||
self.sendLine(1, "AUTHENTICATE {}".format(authstring[400:]))
|
||||
|
||||
self.confirmSuccessfulAuth()
|
||||
@ -305,17 +299,8 @@ class SaslTestCase(cases.BaseServerTestCase):
|
||||
capabilities["sasl"],
|
||||
fail_msg="Does not have PLAIN mechanism as the controller " "claims",
|
||||
)
|
||||
self.requestCapabilities(1, ["sasl"], skip_if_cap_nak=False)
|
||||
self.sendLine(1, "AUTHENTICATE PLAIN")
|
||||
m = self.getRegistrationMessage(1)
|
||||
self.assertMessageMatch(
|
||||
m,
|
||||
command="AUTHENTICATE",
|
||||
params=["+"],
|
||||
fail_msg="Sent “AUTHENTICATE PLAIN”, expected "
|
||||
"“AUTHENTICATE +” as a response, but got: {msg}",
|
||||
)
|
||||
self.sendLine(1, "AUTHENTICATE {}".format(authstring))
|
||||
self.requestCapabilities(1, self.capabilities, skip_if_cap_nak=False)
|
||||
self._doInitialExchange(1, "PLAIN", authstring)
|
||||
self.sendLine(1, "AUTHENTICATE +")
|
||||
|
||||
self.confirmSuccessfulAuth()
|
||||
@ -324,6 +309,12 @@ class SaslTestCase(cases.BaseServerTestCase):
|
||||
# I don't know how to do it, because it would make the registration
|
||||
# message's length too big for it to be valid.
|
||||
|
||||
|
||||
@cases.mark_services
|
||||
class SaslTestCase(_BaseSasl):
|
||||
sasl_ir = False
|
||||
capabilities = ["sasl"]
|
||||
|
||||
@cases.mark_specifications("IRCv3")
|
||||
@cases.skipUnlessHasMechanism("SCRAM-SHA-256")
|
||||
def testScramSha256Success(self):
|
||||
@ -344,7 +335,7 @@ class SaslTestCase(cases.BaseServerTestCase):
|
||||
fail_msg="Does not have SCRAM-SHA-256 mechanism as the "
|
||||
"controller claims",
|
||||
)
|
||||
self.requestCapabilities(1, ["sasl"], skip_if_cap_nak=False)
|
||||
self.requestCapabilities(1, self.capabilities, skip_if_cap_nak=False)
|
||||
|
||||
self.sendLine(1, "AUTHENTICATE SCRAM-SHA-256")
|
||||
m = self.getRegistrationMessage(1)
|
||||
@ -400,7 +391,7 @@ class SaslTestCase(cases.BaseServerTestCase):
|
||||
fail_msg="Does not have SCRAM-SHA-256 mechanism as the "
|
||||
"controller claims",
|
||||
)
|
||||
self.requestCapabilities(1, ["sasl"], skip_if_cap_nak=False)
|
||||
self.requestCapabilities(1, self.capabilities, skip_if_cap_nak=False)
|
||||
|
||||
self.sendLine(1, "AUTHENTICATE SCRAM-SHA-256")
|
||||
m = self.getRegistrationMessage(1)
|
||||
@ -430,3 +421,36 @@ class SaslTestCase(cases.BaseServerTestCase):
|
||||
)
|
||||
m = self.getRegistrationMessage(1)
|
||||
self.assertMessageMatch(m, command=ERR_SASLFAIL)
|
||||
|
||||
|
||||
@cases.mark_services
|
||||
class SaslIrTestCase(_BaseSasl):
|
||||
"""Tests SASL with clients requesting the
|
||||
[sasl-ir](https://github.com/ircv3/ircv3-specifications/pull/520) cap and using it.
|
||||
"""
|
||||
|
||||
sasl_ir = True
|
||||
capabilities = ["sasl", "draft/sasl-ir"]
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.connectClient(
|
||||
"capgetter", capabilities=["draft/sasl-ir"], skip_if_cap_nak=True
|
||||
)
|
||||
|
||||
|
||||
@cases.mark_services
|
||||
class ImplicitSaslIrTestCase(_BaseSasl):
|
||||
"""Tests SASL with clients using the
|
||||
[sasl-ir](https://github.com/ircv3/ircv3-specifications/pull/520) CAP without
|
||||
requesting it.
|
||||
"""
|
||||
|
||||
sasl_ir = True
|
||||
capabilities = ["sasl"]
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.connectClient(
|
||||
"capgetter", capabilities=["draft/sasl-ir"], skip_if_cap_nak=True
|
||||
)
|
||||
|
||||
@ -221,6 +221,7 @@ class WhoisTestCase(_WhoisTestMixin, cases.BaseServerTestCase):
|
||||
)
|
||||
|
||||
@cases.mark_specifications("RFC2812")
|
||||
@cases.xfailIfSoftware(["Sable"], "https://github.com/Libera-Chat/sable/issues/101")
|
||||
def testWhoisMissingUser(self):
|
||||
"""Test WHOIS on a nonexistent nickname."""
|
||||
self.connectClient("qux", name="qux")
|
||||
|
||||
@ -9,7 +9,6 @@ class Specifications(enum.Enum):
|
||||
RFC2812 = "RFC2812"
|
||||
IRCv3 = "IRCv3" # Mark with capabilities whenever possible
|
||||
Ergo = "Ergo"
|
||||
Sable = "Sable"
|
||||
|
||||
Ircdocs = "ircdocs"
|
||||
"""Any document on ircdocs.horse (especially defs.ircdocs.horse),
|
||||
@ -25,9 +24,6 @@ class Specifications(enum.Enum):
|
||||
return spec
|
||||
raise ValueError(name)
|
||||
|
||||
def is_implementation_specific(self) -> bool:
|
||||
return self in (Specifications.Ergo, Specifications.Sable)
|
||||
|
||||
|
||||
@enum.unique
|
||||
class Capabilities(enum.Enum):
|
||||
|
||||
@ -223,9 +223,6 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
|
||||
{
|
||||
"name": "Test with pytest",
|
||||
"timeout-minutes": 30,
|
||||
"env": {
|
||||
"IRCTEST_DEBUG_LOGS": "${{ runner.debug }}",
|
||||
},
|
||||
"run": (
|
||||
f"PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' "
|
||||
f"PATH=$HOME/.local/bin:$PATH "
|
||||
|
||||
@ -8,13 +8,13 @@ index 317b00e..adfcfcf 100644
|
||||
dots = 1;
|
||||
}
|
||||
|
||||
- if (!dots)
|
||||
- if (!dots)
|
||||
- {
|
||||
- sendto_realops("Invalid hostname for %s, dumping user %s",
|
||||
- sptr->hostip, sptr->name);
|
||||
- return exit_client(cptr, sptr, &me, "Invalid hostname");
|
||||
- }
|
||||
-
|
||||
if (bad_dns)
|
||||
-
|
||||
if (bad_dns)
|
||||
{
|
||||
sendto_one(sptr, ":%s NOTICE %s :*** Notice -- You have a bad "
|
||||
|
||||
@ -7,12 +7,7 @@ markers =
|
||||
IRCv3
|
||||
modern
|
||||
ircdocs
|
||||
|
||||
# implementations for which we have specific test get two markers:
|
||||
# the implementation name and 'implementation-specific'
|
||||
implementation-specific
|
||||
Ergo
|
||||
Sable
|
||||
|
||||
# misc marks
|
||||
strict
|
||||
|
||||
@ -97,7 +97,7 @@ software:
|
||||
name: Bahamut
|
||||
repository: DALnet/Bahamut
|
||||
refs:
|
||||
stable: "v2.2.4"
|
||||
stable: "v2.2.1"
|
||||
release: null
|
||||
devel: "master"
|
||||
devel_release: null
|
||||
@ -136,7 +136,7 @@ software:
|
||||
pre_deps:
|
||||
- uses: actions/setup-go@v3
|
||||
with:
|
||||
go-version: '^1.23.0'
|
||||
go-version: '^1.22.0'
|
||||
- run: go version
|
||||
separate_build_job: false
|
||||
build_script: |
|
||||
@ -148,7 +148,7 @@ software:
|
||||
name: InspIRCd
|
||||
repository: inspircd/inspircd
|
||||
refs: &inspircd_refs
|
||||
stable: v3.17.1
|
||||
stable: v3.17.0
|
||||
release: null
|
||||
devel: master
|
||||
devel_release: insp3
|
||||
@ -230,7 +230,7 @@ software:
|
||||
name: ngircd
|
||||
repository: ngircd/ngircd
|
||||
refs:
|
||||
stable: acf8409c60ccc96beed0a1f990c4f9374823c0ce # three months ahead of v27
|
||||
stable: 3e3f6cbeceefd9357b53b27c2386bb39306ab353 # three years ahead of rel-26.1
|
||||
release: null
|
||||
devel: master
|
||||
devel_release: null
|
||||
@ -249,7 +249,7 @@ software:
|
||||
name: Sable
|
||||
repository: Libera-Chat/sable
|
||||
refs:
|
||||
stable: 034c4d5dd937774099773238d8d5b8054b015607
|
||||
stable: e9701e5e8d0c4f278ddd61ce7285f4918ecf99e9
|
||||
release: null
|
||||
devel: master
|
||||
devel_release: null
|
||||
@ -268,9 +268,6 @@ software:
|
||||
workspaces: "sable -> target"
|
||||
cache-on-failure: true
|
||||
- run: rustc --version
|
||||
- run: start postgresql
|
||||
run: "sudo systemctl start postgresql.service"
|
||||
env: "IRCTEST_POSTGRESQL_URL=postgresql://localhost IRCTEST_DEBUG_LOGS=1"
|
||||
separate_build_job: false
|
||||
build_script: |
|
||||
cd $GITHUB_WORKSPACE/sable/
|
||||
@ -303,8 +300,8 @@ software:
|
||||
name: UnrealIRCd 6
|
||||
repository: unrealircd/unrealircd
|
||||
refs:
|
||||
stable: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
|
||||
release: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
|
||||
stable: da3c1c654481a33035b9c703957e1c25d0158259 # 6.0.7
|
||||
release: da3c1c654481a33035b9c703957e1c25d0158259 # 6.0.7
|
||||
devel: unreal60_dev
|
||||
devel_release: null
|
||||
path: unrealircd
|
||||
|
||||
Reference in New Issue
Block a user