val/irctest
1
0
Fork 0
mirror of https://github.com/progval/irctest.git synced 2025-04-05 23:09:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable services tests for hybrid and plexus on the CI (#120)

Browse Source 
* Enable services tests for hybrid and plexus on the CI

* Workaround the broken Github CI's host config
This commit is contained in:
Val Lorentz
2021-11-20 12:15:07 +01:00
committed by GitHub
parent b895539bdd
commit 2684e7edb7
6 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,6 +516,7 @@ jobs:
test-hybrid: test-hybrid:
needs: needs:
- build-hybrid - build-hybrid
- build-anope
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -528,6 +529,11 @@ jobs:
with: with:
name: installed-hybrid name: installed-hybrid
path: '~' path: '~'
- name: Download build artefacts
uses: actions/download-artifact@v2
with:
name: installed-anope
path: '~'
- name: Unpack artefacts - name: Unpack artefacts
run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
- name: Install Atheme - name: Install Atheme
@ -537,7 +543,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make
hybrid hybrid
- if: always() - if: always()
name: Publish results name: Publish results

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

@ -591,6 +591,7 @@ jobs:
test-hybrid: test-hybrid:
needs: needs:
- build-hybrid - build-hybrid
- build-anope
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -603,6 +604,11 @@ jobs:
with: with:
name: installed-hybrid name: installed-hybrid
path: '~' path: '~'
- name: Download build artefacts
uses: actions/download-artifact@v2
with:
name: installed-anope
path: '~'
- name: Unpack artefacts - name: Unpack artefacts
run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
- name: Install Atheme - name: Install Atheme
@ -612,7 +618,7 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-xdist -r requirements.txt pip install pytest pytest-xdist -r requirements.txt
- name: Test with pytest - name: Test with pytest
run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make
hybrid hybrid
- if: always() - if: always()
name: Publish results name: Publish results

4
Makefile
View File

@ -218,7 +218,7 @@ ergo:
hybrid: hybrid:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller irctest.controllers.hybrid \ --controller irctest.controllers.hybrid \
-m 'not services' \ --services-controller=irctest.controllers.anope_services \
-k "$(HYBRID_SELECTORS)" -k "$(HYBRID_SELECTORS)"
inspircd: inspircd:
@ -275,7 +275,7 @@ mammon:
plexus4: plexus4:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller irctest.controllers.plexus4 \ --controller irctest.controllers.plexus4 \
-m 'not services' \ --services-controller=irctest.controllers.anope_services \
-k "$(PLEXUS4_SELECTORS)" -k "$(PLEXUS4_SELECTORS)"
ngircd: ngircd:

2
irctest/controllers/hybrid.py
View File

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

2
irctest/controllers/plexus4.py
View File

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

2
workflows.yml
View File

@ -314,7 +314,7 @@ tests:
software: [charybdis] software: [charybdis]
hybrid: hybrid:
software: [hybrid] software: [hybrid, anope]
solanum: solanum:
software: [solanum] software: [solanum]