Fix agent tests + coverage for subprocesses

Author: sylvinus

mrq/agent.py

@@ -294,7 +294,7 @@ def unpack(v):
                     if total_jobs > total_greenlets and report_count == current_desired_count:
                         desired_count = current_desired_count + 1
 
-            final_count = min(max(desired_count, profile["min_count"]), profile["max_count"])
+            final_count = min(max(desired_count, profile.get("min_count", 0)), profile.get("max_count", 100))
 
             if final_count != current_desired_count:
                 log.debug("Autoscaling: Changing worker profile %s count from %s to %s" % (
@@ -397,7 +397,7 @@ def fetch_worker_group_definition(self):
         definition = connections.mongodb_jobs.mrq_workergroups.find_one({"_id": self.worker_group})
 
         # Prepend all commands by their worker profile.
-        for profileid, profile in definition.get("profiles", {}).items():
+        for profileid, profile in (definition or {}).get("profiles", {}).items():
             profile["command"] = "MRQ_WORKER_PROFILE=%s %s" % (profileid, profile["command"])
 
         return definition

tests/conftest.py

@@ -158,6 +158,11 @@ def start(self, flush=True, deps=True, trace=True, agent=False, **kwargs):
         env = kwargs.get("env") or {}
         env.setdefault("MRQ_MAX_LATENCY", "0.1")
 
+        # Pass coverage-related environment variables
+        for k, v in os.environ.items():
+            if k.startswith("COV_"):
+                env[k] = v
+
         print(cmdline)
         ProcessFixture.start(self, cmdline=cmdline, env=env, expected_children=processes)
 

tests/test_agent.py

@@ -40,7 +40,7 @@ def test_orchestration_scenarios(worker):
         }
     ]) == {
         "worker1": [
-            "mrq-worker a"
+            "MRQ_WORKER_PROFILE=a mrq-worker a"
         ]
     }
 
@@ -102,7 +102,11 @@ def test_orchestration_scenarios(worker):
             "desired_workers": ["mrq-worker c", "mrq-worker b", "mrq-worker b"]
         }
     ]) == {
-        "worker1": ["mrq-worker a", "mrq-worker a", "mrq-worker b"]
+        "worker1": [
+            "MRQ_WORKER_PROFILE=a mrq-worker a",
+            "MRQ_WORKER_PROFILE=a mrq-worker a",
+            "MRQ_WORKER_PROFILE=b mrq-worker b"
+        ]
     }
 
     # Worker removal & add priority
@@ -132,8 +136,12 @@ def test_orchestration_scenarios(worker):
             "desired_workers": ["mrq-worker a", "mrq-worker a"]
         }
     ]) == {
-        "worker1": ["mrq-worker a", "mrq-worker a", "mrq-worker b"],
-        "worker2": ["mrq-worker a"]
+        "worker1": [
+            "MRQ_WORKER_PROFILE=a mrq-worker a",
+            "MRQ_WORKER_PROFILE=a mrq-worker a",
+            "MRQ_WORKER_PROFILE=b mrq-worker b"
+        ],
+        "worker2": ["MRQ_WORKER_PROFILE=a mrq-worker a"]
     }
 
     worker.stop()