carry on...

Author: ric-evans

tests/integration/test_rest_routes.py

@@ -346,131 +346,6 @@ async def _launch_scan(
             },
         },
     }
-    # TODO
-
-    assert 0
-
-
-def foo():
-    # check args (avoid whitespace headaches...)
-    assert resp["scanner_server_args"].split() == scanner_server_args.split()
-    for got_args, exp_args in zip(resp["ewms_task"]["tms_args"], tms_args):
-        print(got_args, exp_args)
-        for got, exp in zip(got_args.split(), exp_args.split()):
-            print(got, exp)
-            if exp == CLUSTER_ID_PLACEHOLDER:
-                assert RE_UUID4HEX.fullmatch(got)
-            else:
-                assert got == exp
-        assert len(got_args.split()) == len(exp_args.split())
-    assert len(resp["ewms_task"]["tms_args"]) == len(tms_args)
-
-    # check env vars
-    print(resp["ewms_task"]["env_vars"])
-    assert set(resp["ewms_task"]["env_vars"].keys()) == {
-        "scanner_server",
-        "tms_starters",
-    }
-
-    # check env vars, more closely
-    # "scanner_server"
-    assert set(  # these have `value`s
-        e["name"]
-        for e in resp["ewms_task"]["env_vars"]["scanner_server"]
-        if e["value"] is not None and e["value_from"] is None
-    ) == {
-        "SKYSCAN_BROKER_ADDRESS",
-        "SKYSCAN_BROKER_AUTH",
-        "SKYSCAN_SKYDRIVER_ADDRESS",
-        "SKYSCAN_SKYDRIVER_AUTH",
-        "SKYSCAN_SKYDRIVER_SCAN_ID",
-        "SKYSCAN_EWMS_PILOT_LOG",
-        "SKYSCAN_MQ_CLIENT_LOG",
-        *post_scan_body["scanner_server_env"].keys(),  # type: ignore[attr-defined]
-    }
-    assert (
-        set(  # these have `value_from`s
-            e
-            for e in resp["ewms_task"]["env_vars"]["scanner_server"]
-            if e["value_from"] is not None and e["value"] is None
-        )
-        == set()
-    )
-    # "tms_starters"
-    for env_dicts in resp["ewms_task"]["env_vars"]["tms_starters"]:
-        assert set(  # these have `value`s
-            e["name"]
-            for e in env_dicts
-            if e["value"] is not None and e["value_from"] is None
-        ) == {
-            "EWMS_PILOT_TASK_TIMEOUT",  # set by CI runner
-            "EWMS_TMS_S3_BUCKET",
-            "EWMS_TMS_S3_URL",
-            "SKYSCAN_BROKER_ADDRESS",
-            "SKYSCAN_BROKER_AUTH",
-            "SKYSCAN_SKYDRIVER_ADDRESS",
-            "SKYSCAN_SKYDRIVER_AUTH",
-            "SKYSCAN_SKYDRIVER_SCAN_ID",
-            "SKYSCAN_EWMS_PILOT_LOG",
-            "SKYSCAN_MQ_CLIENT_LOG",
-            "WORKER_K8S_LOCAL_APPLICATION_NAME",
-            "EWMS_PILOT_DUMP_TASK_OUTPUT",
-        }
-        assert (
-            next(
-                x["value"]
-                for x in env_dicts
-                if x["name"] == "EWMS_PILOT_DUMP_TASK_OUTPUT"
-            )
-            == "True"
-        )
-        assert set(  # these have `value_from`s
-            e["name"]
-            for e in env_dicts
-            if e["value_from"] is not None and e["value"] is None
-        ) == {
-            "CONDOR_TOKEN",
-            "EWMS_TMS_S3_ACCESS_KEY_ID",
-            "EWMS_TMS_S3_SECRET_KEY",
-        } or set(  # these have `value_from`s
-            e["name"]
-            for e in env_dicts
-            if e["value_from"] is not None and e["value"] is None
-        ) == {
-            "WORKER_K8S_CONFIG_FILE_BASE64",
-            "EWMS_TMS_S3_ACCESS_KEY_ID",
-            "EWMS_TMS_S3_SECRET_KEY",
-        }
-
-    # check env vars, even MORE closely
-    for env_dicts in [resp["ewms_task"]["env_vars"]["scanner_server"]] + resp[
-        "ewms_task"
-    ]["env_vars"]["tms_starters"]:
-        assert (
-            next(x["value"] for x in env_dicts if x["name"] == "SKYSCAN_BROKER_ADDRESS")
-            == "localhost"
-        )
-        assert re.match(
-            r"http://localhost:[0-9]+",
-            next(
-                x["value"]
-                for x in env_dicts
-                if x["name"] == "SKYSCAN_SKYDRIVER_ADDRESS"
-            ),
-        )
-        assert (
-            len(
-                next(
-                    x["value"]
-                    for x in env_dicts
-                    if x["name"] == "SKYSCAN_SKYDRIVER_SCAN_ID"
-                )
-            )
-            == 32
-        )
-
-    # get scan_id
-    assert resp["scan_id"]
 
     return resp  # type: ignore[no-any-return]