fix ci

Author: Agent-Hellboy

system_tests/test_basic_validation.py

@@ -24,7 +24,6 @@ def test_extension_files_exist():
     required_files = [
         f'{base_path}/extension_sql/pg_retry.sql',
         f'{base_path}/extension_sql/pg_retry--1.0.0.sql',
-        f'{base_path}/extension_sql/pg_retry--1.0.sql',
         f'{base_path}/src/pg_retry.c',
         f'{base_path}/pg_retry.control',
         f'{base_path}/META.json',
@@ -169,7 +168,11 @@ def test_compilation():
     base_path = '..' if os.path.exists('../src/pg_retry.o') else '.'
     # Check that object files were created
     assert os.path.exists(f'{base_path}/src/pg_retry.o'), "C source not compiled (missing .o file)"
-    assert os.path.exists(f'{base_path}/src/pg_retry.dylib'), "Extension not linked (missing .dylib file)"
+    
+    # Check for platform-specific shared library (.so on Linux, .dylib on macOS)
+    has_so = os.path.exists(f'{base_path}/src/pg_retry.so')
+    has_dylib = os.path.exists(f'{base_path}/src/pg_retry.dylib')
+    assert has_so or has_dylib, "Extension not linked (missing .so or .dylib file)"
 
     print("✅ Compilation validation passed")
 

system_tests/test_pgtap_integration.py

@@ -7,20 +7,21 @@
 import subprocess
 import pytest
 import os
+import psycopg
 
 
 @pytest.mark.pgtap
-def test_pgtap_setup_sql():
+def test_pgtap_setup_sql(pg_cluster):
     """Run pgTAP setup.sql tests."""
     # Check if pgTAP is available by testing if we can create the extension and run a simple test
-    check_result = subprocess.run(
-        ["psql", "-c", "CREATE EXTENSION IF NOT EXISTS pgtap; SELECT plan(1); SELECT pass('pgTAP is working'); SELECT * FROM finish();"],
-        capture_output=True,
-        text=True,
-        timeout=10
-    )
-
-    assert check_result.returncode == 0, f"pgTAP not available - pgTAP tests require pgTAP to be installed. Error: {check_result.stderr}"
+    with psycopg.connect(pg_cluster.dsn()) as conn:
+        try:
+            conn.execute("CREATE EXTENSION IF NOT EXISTS pgtap")
+            result = conn.execute("SELECT plan(1)")
+            conn.execute("SELECT pass('pgTAP is working')")
+            conn.execute("SELECT * FROM finish()")
+        except psycopg.Error as e:
+            pytest.fail(f"pgTAP not available - pgTAP tests require pgTAP to be installed. Error: {e}")
 
     # Change to pgtap directory
     old_cwd = os.getcwd()
@@ -29,12 +30,17 @@ def test_pgtap_setup_sql():
     try:
         os.chdir(pgtap_dir)
 
+        # Set up environment for run_tests.sh to use the test cluster
+        env = pg_cluster.client_env()
+        env["PGDATABASE"] = pg_cluster.database
+        
         # Run the existing run_tests.sh script
         result = subprocess.run(
             ["./run_tests.sh"],
             capture_output=True,
             text=True,
-            timeout=60  # 60 second timeout
+            timeout=60,  # 60 second timeout
+            env=env
         )
 
         # Check that pgTAP ran successfully
@@ -52,15 +58,9 @@ def test_pgtap_setup_sql():
 
 
 @pytest.mark.pgtap
-def test_pgtap_basic_functionality():
+def test_pgtap_basic_functionality(pg_cluster):
     """Test that pgTAP can run basic tests."""
     # Simple test to verify pgTAP is working
-    result = subprocess.run(
-        ["psql", "-c", "SELECT 1 as test;"],
-        capture_output=True,
-        text=True,
-        timeout=10
-    )
-
-    assert result.returncode == 0, f"Basic psql test failed: {result.stderr}"
-    assert "1" in result.stdout, f"Unexpected psql output: {result.stdout}"
+    with psycopg.connect(pg_cluster.dsn()) as conn:
+        result = conn.execute("SELECT 1 as test").fetchone()
+        assert result[0] == 1, f"Unexpected query result: {result}"