diff options
Diffstat (limited to 'nixos/lib/test-driver/test_driver/machine.py')
| -rw-r--r-- | nixos/lib/test-driver/test_driver/machine.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index ffbc7c18e42b..c59ef3b17262 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -699,20 +699,22 @@ class Machine: with self.nested("waiting for file ‘{}‘".format(filename)): retry(check_file) - def wait_for_open_port(self, port: int) -> None: + def wait_for_open_port(self, port: int, addr: str = "localhost") -> None: def port_is_open(_: Any) -> bool: - status, _ = self.execute("nc -z localhost {}".format(port)) + status, _ = self.execute("nc -z {} {}".format(addr, port)) return status == 0 - with self.nested("waiting for TCP port {}".format(port)): + with self.nested("waiting for TCP port {} on {}".format(port, addr)): retry(port_is_open) - def wait_for_closed_port(self, port: int) -> None: + def wait_for_closed_port(self, port: int, addr: str = "localhost") -> None: def port_is_closed(_: Any) -> bool: - status, _ = self.execute("nc -z localhost {}".format(port)) + status, _ = self.execute("nc -z {} {}".format(addr, port)) return status != 0 - with self.nested("waiting for TCP port {} to be closed".format(port)): + with self.nested( + "waiting for TCP port {} on {} to be closed".format(port, addr) + ): retry(port_is_closed) def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: |