testgres.utils.get_pg_version2 is added

dmitry-lipetsk · dmitry-lipetsk · commit ea1149667719 · 2025-03-16T18:04:31.000+03:00
This a version of get_pg_version that requires and uses an explicit os_ops object.
diff --git a/testgres/utils.py b/testgres/utils.py
@@ -203,19 +203,29 @@ def cache_pg_config_data(cmd):
     return cache_pg_config_data("pg_config")
 
 
-def get_pg_version(bin_dir=None):
+def get_pg_version2(os_ops: OsOperations, bin_dir=None):
     """
     Return PostgreSQL version provided by postmaster.
     """
+    assert os_ops is not None
+    assert isinstance(os_ops, OsOperations)
 
     # Get raw version (e.g., postgres (PostgreSQL) 9.5.7)
-    postgres_path = os.path.join(bin_dir, 'postgres') if bin_dir else get_bin_path('postgres')
+    postgres_path = os.path.join(bin_dir, 'postgres') if bin_dir else get_bin_path2(os_ops, 'postgres')
     _params = [postgres_path, '--version']
-    raw_ver = tconf.os_ops.exec_command(_params, encoding='utf-8')
+    raw_ver = os_ops.exec_command(_params, encoding='utf-8')
 
     return parse_pg_version(raw_ver)
 
 
+def get_pg_version(bin_dir=None):
+    """
+    Return PostgreSQL version provided by postmaster.
+    """
+
+    return get_pg_version2(tconf.os_ops, bin_dir)
+
+
 def parse_pg_version(version_out):
     # Generalize removal of system-specific suffixes (anything in parentheses)
     raw_ver = re.sub(r'\([^)]*\)', '', version_out).strip()
