Add bin_dir to make_simple

vshepard · vshepard · commit a5cfdb65f568 · 2024-11-18T11:57:51.000+01:00
diff --git a/testgres/node.py b/testgres/node.py
@@ -1707,12 +1707,13 @@ def __init__(self, test_path=None, nodes_to_cleanup=None, os_ops=LocalOperations
     def make_empty(
             self,
             base_dir=None,
-            port=None):
+            port=None,
+            bin_dir=None):
         real_base_dir = os.path.join(self.test_path, base_dir)
         self.os_ops.rmdirs(real_base_dir, ignore_errors=True)
         self.os_ops.makedirs(real_base_dir)
 
-        node = PostgresNode(base_dir=real_base_dir, port=port)
+        node = PostgresNode(base_dir=real_base_dir, port=port, bin_dir=bin_dir)
         node.should_rm_dirs = True
         self.nodes_to_cleanup.append(node)
 
@@ -1726,10 +1727,11 @@ def make_simple(
             ptrack_enable=False,
             initdb_params=[],
             pg_options={},
-            checksum=True):
+            checksum=True,
+            bin_dir=None):
         if checksum and '--data-checksums' not in initdb_params:
             initdb_params.append('--data-checksums')
-        node = self.make_empty(base_dir, port)
+        node = self.make_empty(base_dir, port, bin_dir=bin_dir)
         node.init(
             initdb_params=initdb_params, allow_streaming=set_replication)
 
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -23,7 +23,7 @@
     BackupException, \
     QueryException, \
     TimeoutException, \
-    TestgresException
+    TestgresException, NodeApp
 
 from testgres import \
     TestgresConfig, \
@@ -1044,6 +1044,23 @@ def test_the_same_port(self):
                 node2.port = node.port
                 node2.init().start()
 
+    def test_make_simple_with_bin_dir(self):
+        with get_new_node() as node:
+            node.init().start()
+            bin_dir = node.bin_dir
+
+        app = NodeApp()
+        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;")
+
+        try:
+            wrong_bin_dir = app.make_empty(base_dir=node.base_dir, bin_dir="wrong/path")
+            wrong_bin_dir.slow_start()
+            raise RuntimeError("Error was expected.")  # We should not reach this
+        except FileNotFoundError:
+            pass # Expected error
+
 
 if __name__ == '__main__':
     if os.environ.get('ALT_CONFIG'):
