Fix failed test_ports_management

vshepard · vshepard · commit 1e8d91280bd2 · 2024-11-18T14:48:08.000+01:00
diff --git a/testgres/node.py b/testgres/node.py
@@ -152,15 +152,15 @@ def __init__(self, name=None, base_dir=None, port=None, conn_params: ConnectionP
             self.os_ops = testgres_config.os_ops
 
         self.host = self.os_ops.host
-        self.port = port or self.os_ops.port or reserve_port()
-
         self.ssh_key = self.os_ops.ssh_key
 
         # defaults for __exit__()
         self.cleanup_on_good_exit = testgres_config.node_cleanup_on_good_exit
         self.cleanup_on_bad_exit = testgres_config.node_cleanup_on_bad_exit
         self.shutdown_max_attempts = 3
 
+        self.port = port or self.os_ops.port or reserve_port()
+
         # NOTE: for compatibility
         self.utils_log_name = self.utils_log_file
         self.pg_log_name = self.pg_log_file
@@ -810,6 +810,7 @@ def stop(self, params=None, wait=True):
 
         self._maybe_stop_logger()
         self.is_started = False
+        release_port(self.port)
         return self
 
     def kill(self, someone=None):
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -1052,6 +1052,7 @@ def test_make_simple_with_bin_dir(self):
         correct_bin_dir = app.make_simple(base_dir=node.base_dir, bin_dir=bin_dir)
         correct_bin_dir.slow_start()
         correct_bin_dir.safe_psql("SELECT 1;")
+        correct_bin_dir.stop()
 
         try:
             wrong_bin_dir = app.make_empty(base_dir=node.base_dir, bin_dir="wrong/path")
