Fixed tests

Author: edomora97

python/args.py

@@ -133,6 +133,10 @@ def add_server_group(parser: argparse.ArgumentParser):
         action="store",
         type=int,
         help="Port to listen on")
+    group.add_argument(
+        "--server-verbose",
+        action="store_true",
+        help="Verbose logging for the server")
 
 
 def add_worker_group(parser: argparse.ArgumentParser):
@@ -172,6 +176,10 @@ def add_worker_group(parser: argparse.ArgumentParser):
         action="store",
         type=int,
         help="Maximum number of pending requests")
+    group.add_argument(
+        "--worker-verbose",
+        action="store_true",
+        help="Verbose logging for the worker")
 
 
 def add_execution_group(parser: argparse.ArgumentParser):

python/config.py

@@ -16,12 +16,14 @@ class Config:
             "server", "run_server", "run_worker", "storedir", "tempdir",
             "cache_size"
         ],
-        "server":
-        ["server_logfile", "server_pidfile", "server_address", "server_port"],
+        "server": [
+            "server_logfile", "server_pidfile", "server_address", "server_port",
+            "server_verbose"
+        ],
         "worker": [
             "worker_logfile", "worker_pidfile", "worker_keep_sandboxes",
             "worker_name", "worker_num_cores", "worker_port", "worker_address",
-            "worker_pending_requests"
+            "worker_pending_requests", "worker_verbose"
         ],
         "execution": ["exclusive", "extra_time", "copy_exe"],
         "ioi": ["detailed_checker"],
@@ -62,6 +64,7 @@ def __init__(self):
         self.server_pidfile = None  # type: Optional[str]
         self.server_address = None  # type: Optional[str]
         self.server_port = 7070
+        self.server_verbose = False
 
         # worker group
         self.worker_logfile = "/tmp/task-maker-worker.log"
@@ -72,6 +75,7 @@ def __init__(self):
         self.worker_port = 7070
         self.worker_address = "127.0.0.1"
         self.worker_pending_requests = None  # type: Optional[int]
+        self.worker_verbose = False
 
         # execution group
         self.exclusive = False

python/manager.py

@@ -48,6 +48,8 @@ def spawn_server(config: Config):
         args += ["--address", config.server_address]
     if config.server_port is not None:
         args += ["--port", str(config.server_port)]
+    if config.server_verbose:
+        args += ["--verbose"]
     spawn_backend("server", args, not config.run_server)
 
 
@@ -73,6 +75,8 @@ def spawn_worker(config: Config):
         args += ["--server", config.worker_address]
     if config.worker_pending_requests is not None:
         args += ["--pending-requests", str(config.worker_pending_requests)]
+    if config.worker_verbose:
+        args += ["--verbose"]
     spawn_backend("worker", args, not config.run_worker)
 
 

python/tests/test.py

@@ -40,21 +40,15 @@ def run_tests(task_name: str, file: str):
     config.cache = CacheMode.NOTHING
     config.task_dir = task_path
     config.dry_run = True
-    config.server_args = \
-        "--store-dir='{}/files' " \
-        "--temp-dir='{}/temp' " \
-        "--pidfile='{}/server.pid' " \
-        "--logfile={}/server.log " \
-        "--verbose " \
-        "--port=7070".format(temp_dir, temp_dir, temp_dir, temp_dir)
-    config.worker_args = \
-        "--store-dir='{}/files' " \
-        "--temp-dir='{}/temp' " \
-        "--pidfile='{}/worker.pid' " \
-        "--logfile={}/worker.log " \
-        "--verbose " \
-        "--name=local " \
-        "--server=127.0.0.1:7070".format(temp_dir, temp_dir, temp_dir, temp_dir)
+    config.storedir = temp_dir + "/files"
+    config.tempdir = temp_dir + "/temp"
+    config.server_pidfile = temp_dir + "/server.pid"
+    config.server_logfile = temp_dir + "/server.log"
+    config.server_verbose = True
+    config.server_port = 7070
+    config.worker_pidfile = temp_dir + "/worker.pid"
+    config.worker_logfile = temp_dir + "/worker.log"
+    config.worker_verbose = True
     global interface
     setup(config)
     ret = run(config)