Update to ergo 2.15+

tests/end_to_end/__main__.py

@@ -14,6 +14,7 @@ import signal
 import atexit
 import sys
 import os
+import shutil
 
 from slixmpp.xmlstream.matcher.base import MatcherBase
 
@@ -180,8 +181,9 @@ class IrcServerRunner(ProcessRunner):
             os.remove("ircd.db")
         except FileNotFoundError:
             pass
-        subprocess.run(["oragono", "mkcerts", "--conf", os.getcwd() + "/../tests/end_to_end/ircd.yaml"])
-        self.create = asyncio.create_subprocess_exec("oragono", "run", "--conf", os.getcwd() + "/../tests/end_to_end/ircd.yaml",
+        ergo_path = shutil.which("ergo") or shutil.which("ergochat")
+        subprocess.run([ergo_path, "mkcerts", "--conf", os.getcwd() + "/../tests/end_to_end/ircd.yaml"])
+        self.create = asyncio.create_subprocess_exec(ergo_path, "run", "--conf", os.getcwd() + "/../tests/end_to_end/ircd.yaml",
                                                      stderr=asyncio.subprocess.PIPE)
 
 class BiboumiTest:
@@ -205,7 +207,8 @@ class BiboumiTest:
             pass
         logging.basicConfig(level=logging.DEBUG,
                             format='%(levelname)-8s %(message)s',
-                            filename=output_filename)
+                            filename=output_filename,
+                            force=True)
 
         with open("test.conf", "w") as fd:
             fd.write(confs[self.scenario.conf])
@@ -241,7 +244,7 @@ class BiboumiTest:
 
         xmpp.saved_values.clear()
 
-        if xmpp.server:
+        if xmpp.boundjid.host:
             xmpp.accepting_server.close()
 
         return not failed