Fix renamed symbols

ooni · Sep 11, 2024 · 117daed · 117daed
1 parent 62dc500
commit 117daed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 47 deletions.
diff --git a/oonipipeline/tests/test_cli.py b/oonipipeline/tests/test_cli.py
@@ -37,29 +37,6 @@ def __init__(self):
         self.default_map = {}
 
 
-@pytest.mark.skip("TODO(art): maybe test new settings parsing")
-def test_parse_config(tmp_path):
-    ctx = MockContext()
-
-    config_content = """[options]
-    something = other
-    [options.subcommand]
-    otherthing = bar
-    [options.subcommand2]
-    spam = ham
-    """
-    config_path = tmp_path / "config.ini"
-    with config_path.open("w") as out_file:
-        out_file.write(textwrap.dedent(config_content))
-    defaults = parse_config_file(ctx, str(config_path))
-    assert defaults["something"] == "other"
-    assert defaults["subcommand"]["otherthing"] == "bar"
-    assert defaults["subcommand2"]["spam"] == "ham"
-    assert defaults["schedule"]["something"] == "other"
-    assert defaults["backfill"]["something"] == "other"
-
-
-@pytest.mark.skip("TODO(art): moved into temporal_e2e")
 def test_full_workflow(
     db,
     cli_runner,
@@ -84,12 +61,6 @@ def test_full_workflow(
             datadir,
             "--clickhouse",
             db.clickhouse_url,
-            "--clickhouse-buffer-min-time",
-            1,
-            "--clickhouse-buffer-max-time",
-            2,
-            # "--archives-dir",
-            # tmp_path.absolute(),
         ],
     )
     assert result.exit_code == 0
@@ -103,14 +74,8 @@ def test_full_workflow(
             "2022-10-22",
             "--clickhouse",
             db.clickhouse_url,
-            "--clickhouse-buffer-min-time",
-            1,
-            "--clickhouse-buffer-max-time",
-            2,
-            "--schedule-id",
-            "oonipipeline-observations-schedule-ba-web_connectivity",
-            # "--archives-dir",
-            # tmp_path.absolute(),
+            "--workflow-name",
+            "observations",
         ],
     )
     assert result.exit_code == 0
@@ -137,14 +102,8 @@ def test_full_workflow(
             "2022-10-22",
             "--clickhouse",
             db.clickhouse_url,
-            "--clickhouse-buffer-min-time",
-            1,
-            "--clickhouse-buffer-max-time",
-            2,
-            "--schedule-id",
-            "oonipipeline-observations-schedule-ba-web_connectivity",
-            # "--archives-dir",
-            # tmp_path.absolute(),
+            "--workflow-name",
+            "observations",
         ],
     )
     assert result.exit_code == 0

diff --git a/oonipipeline/tests/test_temporal_e2e.py b/oonipipeline/tests/test_temporal_e2e.py
@@ -3,7 +3,7 @@
 from oonipipeline.temporal.schedules import (
     list_existing_schedules,
     schedule_all,
-    clear_schedules,
+    clear_all_schedules,
 )
 import pytest
 
@@ -36,7 +36,7 @@ async def test_scheduling(datadir, db):
 
         scheduled_ids = [sched_res.analysis, sched_res.observations]
         while len(scheduled_ids) > 0:
-            cleared_schedule_ids = await clear_schedules(
+            cleared_schedule_ids = await clear_all_schedules(
                 client=env.client,
                 probe_cc=[],
                 test_name=[],