From 2078fa942af2fbfc99392981226b5f0817375bfa Mon Sep 17 00:00:00 2001
From: Oscar Moll <orm@csail.mit.edu>
Date: Thu, 16 May 2024 23:41:58 -0400
Subject: [PATCH] try flag

---
 .github/workflows/build-and-test.yml |  2 +-
 src/pgserver/postgres_server.py      | 13 ++++++-------
 src/pgserver/utils.py                |  3 +--
 tests/test_pgserver.py               |  6 ++++++
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index ac20e04..baba739 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -69,7 +69,7 @@ jobs:
         env:
           CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_SKIP: pp* cp38-* *-musllinux*
-          MACOSX_DEPLOYMENT_TARGET: "12.0"
+          MACOSX_DEPLOYMENT_TARGET: ${{ runner.os == 'macos-12' && '12.0' || '14.0' }}
         run: python -m cibuildwheel --output-dir wheelhouse
       - name: Save postgres build
         if: ${{ matrix.os == 'ubuntu-latest' && ! steps.restore-postgres.outputs.cache-hit }}
diff --git a/src/pgserver/postgres_server.py b/src/pgserver/postgres_server.py
index 9bd00bb..07f557c 100644
--- a/src/pgserver/postgres_server.py
+++ b/src/pgserver/postgres_server.py
@@ -137,14 +137,13 @@ def ensure_postgres_running(self) -> None:
 
         postmaster_info = PostmasterInfo.read_from_pgdata(self.pgdata)
         if postmaster_info is not None and postmaster_info.is_running():
+            _logger.info(f"a postgres server is already running: {postmaster_info=} {postmaster_info.process=}")
             self._postmaster_info = postmaster_info
-            _logger.info(f"a postgres server is already running: {self._postmaster_info=} {self._postmaster_info.process=}")
-
-            if self._postmaster_info.status != 'ready':
-                _logger.warning(f"the server is running but not ready (unexpected) {self._postmaster_info=}")
         else:
-            _logger.info(f"no postgres server found running, assuming stale {self._postmaster_info=} ")
-
+            if postmaster_info is not None and not postmaster_info.is_running():
+                _logger.info(f"found a postmaster.pid file, but the server is not running: {postmaster_info=}")
+            if postmaster_info is None:
+                _logger.info(f"no postmaster.pid file found in {self.pgdata}")
 
             if platform.system() != 'Windows':
                 # use sockets to avoid any future conflict with port numbers
@@ -184,7 +183,7 @@ def ensure_postgres_running(self) -> None:
 
             self._postmaster_info = PostmasterInfo.read_from_pgdata(self.pgdata)
 
-        _logger.info(f"ensuring server is running: {self._postmaster_info=}")
+        _logger.info(f"Now asserting server is running {self._postmaster_info=}")
         assert self._postmaster_info is not None
         assert self._postmaster_info.is_running()
         assert self._postmaster_info.status == 'ready'
diff --git a/src/pgserver/utils.py b/src/pgserver/utils.py
index f38d2bf..b44d777 100644
--- a/src/pgserver/utils.py
+++ b/src/pgserver/utils.py
@@ -121,12 +121,11 @@ def socket_path(self) -> Optional[Path]:
         return None
 
     def __repr__(self) -> str:
-        return f"PostmasterInfo(pid={self.pid}, pgdata={self.pgdata}, start_time={self.start_time}, hostname={self.hostname} port={self.port}, socket_dir={self.socket_dir})"
+        return f"PostmasterInfo(pid={self.pid}, pgdata={self.pgdata}, start_time={self.start_time}, hostname={self.hostname} port={self.port}, socket_dir={self.socket_dir} status={self.status}, process={self.process})"
 
     def __str__(self) -> str:
         return self.__repr__()
 
-
 def process_is_running(pid : int) -> bool:
     assert pid is not None
     return psutil.pid_exists(pid)
diff --git a/tests/test_pgserver.py b/tests/test_pgserver.py
index 98c67d2..a862386 100644
--- a/tests/test_pgserver.py
+++ b/tests/test_pgserver.py
@@ -195,9 +195,15 @@ def test_stale_postmaster():
         ( our method to kill the server is graceful to avoid running out of shmem, but this seems to also
             remove the postmaster.pid file, so we need to go to these lengths to simulate a stale postmaster.pid file )
     """
+    if platform.system() != 'Windows' and os.geteuid() == 0:
+        # on Linux as root, this test fails bc of permissions for the postmaster.pid file
+        # we simply skip it in this case, as in practice, the permissions issue would not occur
+        pytest.skip("This test is not run as root on Linux.")
+
     with tempfile.TemporaryDirectory() as tmpdir:
         pid = None
         pid2 = None
+
         try:
             with pgserver.get_server(tmpdir, cleanup_mode='stop') as pg:
                 pid = _check_server(pg)