From 645858617986cc94f0f617b1423ff4f14c675795 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Sun, 27 Jun 2021 00:26:41 +0200
Subject: [PATCH] Make find_hostname_and_port its own function

So it can be used to generate multiple ports, which will be needed
to link services.
---
 irctest/cases.py                | 11 ++---------
 irctest/irc_utils/junkdrawer.py | 12 +++++++++++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/irctest/cases.py b/irctest/cases.py
index bad4a37..2e2cefb 100644
--- a/irctest/cases.py
+++ b/irctest/cases.py
@@ -29,7 +29,7 @@ from .authentication import Authentication
 from .basecontrollers import TestCaseControllerConfig
 from .exceptions import ConnectionClosed
 from .irc_utils import capabilities, message_parser
-from .irc_utils.junkdrawer import normalizeWhitespace
+from .irc_utils.junkdrawer import find_hostname_and_port, normalizeWhitespace
 from .irc_utils.message_parser import Message
 from .irc_utils.sasl import sasl_plain_blob
 from .numerics import (
@@ -462,7 +462,7 @@ class BaseServerTestCase(
     def setUp(self) -> None:
         super().setUp()
         self.server_support = None
-        self.find_hostname_and_port()
+        (self.hostname, self.port) = find_hostname_and_port()
         self.controller.run(
             self.hostname,
             self.port,
@@ -478,13 +478,6 @@ class BaseServerTestCase(
         for client in list(self.clients):
             self.removeClient(client)
 
-    def find_hostname_and_port(self) -> None:
-        """Find available hostname/port to listen on."""
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        s.bind(("", 0))
-        (self.hostname, self.port) = s.getsockname()
-        s.close()
-
     def addClient(
         self, name: Optional[TClientName] = None, show_io: Optional[bool] = None
     ) -> TClientName:
diff --git a/irctest/irc_utils/junkdrawer.py b/irctest/irc_utils/junkdrawer.py
index 249d023..0719521 100644
--- a/irctest/irc_utils/junkdrawer.py
+++ b/irctest/irc_utils/junkdrawer.py
@@ -1,7 +1,8 @@
 import datetime
 import re
 import secrets
-from typing import Dict
+import socket
+from typing import Dict, Tuple
 
 # thanks jess!
 IRCV3_FORMAT_STRFTIME = "%Y-%m-%dT%H:%M:%S.%f%z"
@@ -15,6 +16,15 @@ def random_name(base: str) -> str:
     return base + "-" + secrets.token_hex(8)
 
 
+def find_hostname_and_port() -> Tuple[str, int]:
+    """Find available hostname/port to listen on."""
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    s.bind(("", 0))
+    (hostname, port) = s.getsockname()
+    s.close()
+    return (hostname, port)
+
+
 """
 Stolen from supybot:
 """