summaryrefslogtreecommitdiff
path: root/tests/end_to_end/__main__.py
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2020-03-24 22:16:07 +0100
committerlouiz’ <louiz@louiz.org>2020-05-05 21:10:46 +0200
commit81fb7389ae61c000630ddce505cffca2c2ec8b3a (patch)
treeed42b41d0a6aa7cdfea1fc63d5e40172ef8930f9 /tests/end_to_end/__main__.py
parenteb976918f95316c7d07b52f77430604a431c4814 (diff)
downloadbiboumi-81fb7389ae61c000630ddce505cffca2c2ec8b3a.tar.gz
biboumi-81fb7389ae61c000630ddce505cffca2c2ec8b3a.tar.bz2
biboumi-81fb7389ae61c000630ddce505cffca2c2ec8b3a.tar.xz
biboumi-81fb7389ae61c000630ddce505cffca2c2ec8b3a.zip
Start oragono instead of charybdis
Diffstat (limited to 'tests/end_to_end/__main__.py')
-rw-r--r--tests/end_to_end/__main__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py
index bebc78c..e4d7671 100644
--- a/tests/end_to_end/__main__.py
+++ b/tests/end_to_end/__main__.py
@@ -183,7 +183,7 @@ class BiboumiRunner(ProcessRunner):
class IrcServerRunner(ProcessRunner):
def __init__(self):
super().__init__()
- self.create = asyncio.create_subprocess_exec("charybdis", "-foreground", "-configfile", os.getcwd() + "/../tests/end_to_end/ircd.conf",
+ self.create = asyncio.create_subprocess_exec("oragono", "run", "--conf", os.getcwd() + "/../tests/end_to_end/ircd.yaml",
stderr=asyncio.subprocess.PIPE)
class BiboumiTest:
@@ -324,7 +324,7 @@ if __name__ == '__main__':
if not res:
print("IRC server failed to start, see irc_output.txt for more details. Exiting…")
sys.exit(1)
- if b"now running in foreground mode" in res:
+ if b"Server running" in res:
break
print("irc server started.")