From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 22 Feb 2015 12:03:17 +0000 (+0100)
Subject: Server/py: Add server_test() remake.
X-Git-Tag: tce~497
X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/index.html?a=commitdiff_plain;h=76180c99a9cf02004faaf1fb70e79a41228c7746;p=plomrogue

Server/py: Add server_test() remake.
---

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 671edd0..df0c211 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -28,6 +28,7 @@ def setup_server_io(io_db):
     os.makedirs(io_dir, exist_ok=True)
     io_db["file_out"] = open(io_db["path_out"], "w")
     io_db["file_out"].write(io_db["teststring"] + "\n")
+    io_db["file_out"].flush()
     if os.access(io_db["path_in"], os.F_OK):
         os.remove(io_db["path_in"])
     io_db["file_in"] = open(io_db["path_in"], "w")
@@ -129,6 +130,20 @@ def parse_command_line_arguments():
     return opts
 
 
+def server_test(io_db):
+    """Check for valid server out file belonging to current process."""
+    if not os.access(io_db["path_out"], os.F_OK):
+        raise SystemExit("Server output file has disappeared.")
+    file = open(io_db["path_out"], "r")
+    test = file.readline().rstrip("\n")
+    file.close()
+    print(str(test) + " == " + io_db["teststring"] + " ?")
+    if test != io_db["teststring"]:
+        msg = "Server test string in server output file does not match. This" \
+              " indicates that the current server process has been " \
+              "superseded by another one."
+        raise SystemExit(msg)
+
 io_db = {}
 world_db = {}
 try: