PCSM-237: Fix intermittent test failures due to race condition in wait_for_current_optime() (#156)

Author: inelpandzic

.gitignore

@@ -16,3 +16,5 @@ __pycache__
 
 /org.md
 /scratch.*
+
+CLAUDE.md

pyproject.toml

@@ -15,5 +15,5 @@ build-backend = "poetry.core.masonry.api"
 [tool.pytest.ini_options]
 addopts = "-ra"
 testpaths = ["tests"]
-timeout = 10
+timeout = 15
 timeout_func_only = true

pyrightconfig.json

@@ -0,0 +1,8 @@
+{
+  "venvPath": ".",
+  "venv": ".venv",
+  "extraPaths": ["tests"],
+  "pythonVersion": "3.13",
+  "typeCheckingMode": "basic",
+  "useLibraryCodeForTypes": true
+}

tests/pcsm.py

@@ -186,13 +186,20 @@ def wait_for_current_optime(self):
         status = self.pcsm.status()
         assert status["state"] == PCSM.State.RUNNING, status
 
-        curr_optime = self.source.server_info()["$clusterTime"]["clusterTime"]
+        result = self.source.admin.command(
+            {"appendOplogNote": 1, "data": {"msg": "test:sync_point"}}
+        )
+        curr_optime = result["$clusterTime"]["clusterTime"]
+
         for _ in range(self.wait_timeout * 2):
-            if curr_optime <= self.last_applied_op:
+            last_applied = self.last_applied_op
+            if curr_optime <= last_applied:
+                # Even though the oplog entry is replicated, PCSM may not have finished
+                # writing to the target database. Add a small delay to ensure completion.
+                time.sleep(0.3)
                 return
 
             time.sleep(0.5)
-            status = self.pcsm.status()
 
         raise WaitTimeoutError()