From 2684e7edb7a52d42f844a1b3e2b161941e55bb37 Mon Sep 17 00:00:00 2001
From: Val Lorentz <progval+git@progval.net>
Date: Sat, 20 Nov 2021 12:15:07 +0100
Subject: [PATCH] Enable services tests for hybrid and plexus on the CI (#120)

* Enable services tests for hybrid and plexus on the CI

* Workaround the broken Github CI's host config
---
 .github/workflows/test-devel.yml  | 8 +++++++-
 .github/workflows/test-stable.yml | 8 +++++++-
 Makefile                          | 4 ++--
 irctest/controllers/hybrid.py     | 2 +-
 irctest/controllers/plexus4.py    | 2 +-
 workflows.yml                     | 2 +-
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-devel.yml b/.github/workflows/test-devel.yml
index 43e775b..940e609 100644
--- a/.github/workflows/test-devel.yml
+++ b/.github/workflows/test-devel.yml
@@ -516,6 +516,7 @@ jobs:
   test-hybrid:
     needs:
     - build-hybrid
+    - build-anope
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -528,6 +529,11 @@ jobs:
       with:
         name: installed-hybrid
         path: '~'
+    - name: Download build artefacts
+      uses: actions/download-artifact@v2
+      with:
+        name: installed-anope
+        path: '~'
     - name: Unpack artefacts
       run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
     - name: Install Atheme
@@ -537,7 +543,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  make
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH   make
         hybrid
     - if: always()
       name: Publish results
diff --git a/.github/workflows/test-stable.yml b/.github/workflows/test-stable.yml
index 29ca4d0..6a42820 100644
--- a/.github/workflows/test-stable.yml
+++ b/.github/workflows/test-stable.yml
@@ -591,6 +591,7 @@ jobs:
   test-hybrid:
     needs:
     - build-hybrid
+    - build-anope
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -603,6 +604,11 @@ jobs:
       with:
         name: installed-hybrid
         path: '~'
+    - name: Download build artefacts
+      uses: actions/download-artifact@v2
+      with:
+        name: installed-anope
+        path: '~'
     - name: Unpack artefacts
       run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
     - name: Install Atheme
@@ -612,7 +618,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  make
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH   make
         hybrid
     - if: always()
       name: Publish results
diff --git a/Makefile b/Makefile
index 37d3726..34321d2 100644
--- a/Makefile
+++ b/Makefile
@@ -218,7 +218,7 @@ ergo:
 hybrid:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller irctest.controllers.hybrid \
-		-m 'not services' \
+		--services-controller=irctest.controllers.anope_services \
 		-k "$(HYBRID_SELECTORS)"
 
 inspircd:
@@ -275,7 +275,7 @@ mammon:
 plexus4:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller irctest.controllers.plexus4 \
-		-m 'not services' \
+		--services-controller=irctest.controllers.anope_services \
 		-k "$(PLEXUS4_SELECTORS)"
 
 ngircd:
diff --git a/irctest/controllers/hybrid.py b/irctest/controllers/hybrid.py
index 6725e7d..65e174a 100644
--- a/irctest/controllers/hybrid.py
+++ b/irctest/controllers/hybrid.py
@@ -40,7 +40,7 @@ class {{
 }};
 connect {{
     name = "services.example.org";
-    host = "localhost";  # Used to validate incoming connection
+    host = "127.0.0.1";  # Used to validate incoming connection
     port = 0;  # We don't need servers to connect to services
     send_password = "password";
     accept_password = "password";
diff --git a/irctest/controllers/plexus4.py b/irctest/controllers/plexus4.py
index 83fa78b..395b4e4 100644
--- a/irctest/controllers/plexus4.py
+++ b/irctest/controllers/plexus4.py
@@ -45,7 +45,7 @@ class {{
 }};
 connect {{
     name = "services.example.org";
-    host = "localhost";  # Used to validate incoming connection
+    host = "127.0.0.1";  # Used to validate incoming connection
     port = 0;  # We don't need servers to connect to services
     send_password = "password";
     accept_password = "password";
diff --git a/workflows.yml b/workflows.yml
index 7117f1a..a7816c9 100644
--- a/workflows.yml
+++ b/workflows.yml
@@ -314,7 +314,7 @@ tests:
         software: [charybdis]
 
     hybrid:
-        software: [hybrid]
+        software: [hybrid, anope]
 
     solanum:
         software: [solanum]