Attempt to fix HA tests

canonical · Jul 21, 2023 · 65c790e · 65c790e
1 parent 6bb68a1
commit 65c790e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/tests/integration/ha_tests/application_charm/src/charm.py b/tests/integration/ha_tests/application_charm/src/charm.py
@@ -25,7 +25,7 @@
 
 DATABASE_NAME = "continuous_writes_database"
 PEER = "application-peers"
-LAST_WRITTEN_FILE = "/tmp/last_written_value"
+LAST_WRITTEN_FILE = "last_written_value"
 PROC_PID_KEY = "proc-pid"
 
 
@@ -124,7 +124,10 @@ def _stop_continuous_writes(self) -> Optional[int]:
             return None
 
         # Send a SIGTERM to the process and wait for the process to exit
-        os.kill(int(self.app_peer_data[PROC_PID_KEY]), signal.SIGTERM)
+        try:
+            os.kill(int(self.app_peer_data[PROC_PID_KEY]), signal.SIGTERM)
+        except ProcessLookupError:
+            logger.info(f"Process {PROC_PID_KEY} was killed already (or never existed)")
 
         del self.app_peer_data[PROC_PID_KEY]
 

diff --git a/tests/integration/ha_tests/application_charm/src/continuous_writes.py b/tests/integration/ha_tests/application_charm/src/continuous_writes.py
@@ -52,7 +52,7 @@ def continous_writes(connection_string: str, starting_number: int):
 
         write_value += 1
 
-    with open("/tmp/last_written_value", "w") as fd:
+    with open("last_written_value", "w") as fd:
         fd.write(str(write_value - 1))