From 1e01cb32865c914c34ffbea24291c7575fa7ca41 Mon Sep 17 00:00:00 2001
From: Val Lorentz <progval+git@progval.net>
Date: Wed, 13 Apr 2022 19:57:16 +0200
Subject: [PATCH] Fix CI (#157)

Broken by recent merges
---
 .github/workflows/test-devel.yml  |  4 ++--
 .github/workflows/test-stable.yml |  4 ++--
 irctest/server_tests/list.py      | 14 ++++++++++----
 irctest/server_tests/names.py     |  1 +
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-devel.yml b/.github/workflows/test-devel.yml
index 0ba6d98..6d8ab8f 100644
--- a/.github/workflows/test-devel.yml
+++ b/.github/workflows/test-devel.yml
@@ -751,8 +751,8 @@ jobs:
         make -j 4
         make install
         cp $GITHUB_WORKSPACE/data/nefarious/* $HOME/.local/lib
-    - name: Install Atheme
-      run: sudo apt-get install atheme-services
+    - name: Install system dependencies
+      run: sudo apt-get install atheme-services faketime
     - name: Install irctest dependencies
       run: |-
         python -m pip install --upgrade pip
diff --git a/.github/workflows/test-stable.yml b/.github/workflows/test-stable.yml
index 5936fe6..e9d42cc 100644
--- a/.github/workflows/test-stable.yml
+++ b/.github/workflows/test-stable.yml
@@ -911,8 +911,8 @@ jobs:
         make -j 4
         make install
         cp $GITHUB_WORKSPACE/data/nefarious/* $HOME/.local/lib
-    - name: Install Atheme
-      run: sudo apt-get install atheme-services
+    - name: Install system dependencies
+      run: sudo apt-get install atheme-services faketime
     - name: Install irctest dependencies
       run: |-
         python -m pip install --upgrade pip
diff --git a/irctest/server_tests/list.py b/irctest/server_tests/list.py
index 2649076..56e300f 100644
--- a/irctest/server_tests/list.py
+++ b/irctest/server_tests/list.py
@@ -7,9 +7,6 @@ The LIST command  (`RFC 1459
 
 import time
 
-
-from irctest import cases
-
 from irctest import cases, runner
 from irctest.numerics import RPL_LIST, RPL_LISTEND, RPL_LISTSTART
 
@@ -300,7 +297,12 @@ class FaketimeListTestCase(_BasedListTestCase):
 
             self.sendLine(2, "LIST C>10")
             self.assertEqual(self._parseChanList(2), {"#chan1", "#chan2"})
-        elif self.controller.software_name in ("Solanum", "Charybdis", "InspIRCd"):
+        elif self.controller.software_name in (
+            "Solanum",
+            "Charybdis",
+            "InspIRCd",
+            "Nefarious",
+        ):
             self.sendLine(2, "LIST C>2")
             self.assertEqual(self._parseChanList(2), {"#chan1"})
 
@@ -323,6 +325,9 @@ class FaketimeListTestCase(_BasedListTestCase):
 
     @cases.mark_isupport("ELIST")
     @cases.mark_specifications("Modern")
+    @cases.xfailIfSoftware(
+        ["UnrealIRCd"], "UnrealIRCd advertises ELIST=T but does not implement it"
+    )
     def testListTopicTime(self):
         """
         "T: Searching based on topic time, via the "T<val" and "T>val"
@@ -387,6 +392,7 @@ class FaketimeListTestCase(_BasedListTestCase):
             "InspIRCd",
             "Plexus4",
             "Hybrid",
+            "Nefarious",
         ):
             self.sendLine(1, "LIST T>2")
             self.assertEqual(self._parseChanList(1), {"#chan1"})
diff --git a/irctest/server_tests/names.py b/irctest/server_tests/names.py
index 801fcac..3285be2 100644
--- a/irctest/server_tests/names.py
+++ b/irctest/server_tests/names.py
@@ -9,6 +9,7 @@ from irctest import cases, runner
 from irctest.numerics import RPL_ENDOFNAMES, RPL_NAMREPLY
 from irctest.patma import ANYSTR, StrRe
 
+
 class NamesTestCase(cases.BaseServerTestCase):
     def _testNames(self, symbol):
         self.connectClient("nick1")