Server/py: Add server_test() remake.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 34009382f77b3eac39ec03eb147288691b553510..df0c211bdd2458ffad559f636404abd4f90285ae 100755 (executable)
--- 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")
@@ -98,7 +99,7 @@ def record(cmd, io_db):
     os.rename(path_tmp, io_db["path_record"])
 
 
-def obey_lines_in_file(path, name, break_test = None):
+def obey_lines_in_file(path, name, break_test=None):
     """Call obey() on each line of path's file, use name in input prefix.
 
     If break_test function is set, only read the file until it returns True.
@@ -120,15 +121,35 @@ def make_turn_tester(turn_to_compare, world_db):
     return turn_tester
 
 
-io_db = {}
-world_db = {}
-try:
+def parse_command_line_arguments():
+    """Return settings values read from command line arguments."""
     parser = argparse.ArgumentParser()
     parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
                         action='store')
+    opts, unknown = parser.parse_known_args()
+    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:
+    opts = parse_command_line_arguments()
     setup_server_io(io_db)
     # print("DUMMY: Run game.")
-    opts, unknown = parser.parse_known_args()
     if None != opts.replay:
         if opts.replay < 1:
             opts.replay = 1
@@ -139,6 +160,7 @@ try:
         world_db["turn"] = 0
         break_tester = make_turn_tester(opts.replay, world_db)
         obey_lines_in_file(io_db["path_record"], "record ", break_tester)
+        # what to do next?
     else:
         if os.access(io_db["path_save"], os.F_OK):
             obey_lines_in_file(io_db["path_save"], "save")