From 92204213f31864b0262c21b3578295c3e07f3e69 Mon Sep 17 00:00:00 2001
From: Paul Spooren <mail@aparcar.org>
Date: Tue, 6 Feb 2024 14:54:30 +0100
Subject: [PATCH] tests: fix

Signed-off-by: Paul Spooren <mail@aparcar.org>
---
 asu/build.py                           |  3 +--
 tests/conftest.py                      | 19 ++++++++++++++++---
 tests/test_janitor.py                  | 14 +-------------
 tests/test_package_changes.py          |  2 +-
 tests/upstream/snapshots/.targets.json |  1 +
 5 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 tests/upstream/snapshots/.targets.json

diff --git a/asu/build.py b/asu/build.py
index cd18365d..4d5bb913 100644
--- a/asu/build.py
+++ b/asu/build.py
@@ -21,7 +21,6 @@
 from asu.package_changes import appy_package_changes
 
 log = logging.getLogger("rq.worker")
-log.setLevel(logging.DEBUG)
 
 
 def build(req: dict, job=None):
@@ -266,7 +265,7 @@ def build(req: dict, job=None):
             podman,
             image,
             [
-                "bash",
+                "sh",
                 "-c",
                 (
                     "env;"
diff --git a/tests/conftest.py b/tests/conftest.py
index 3088c4f2..8ba7b66a 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -22,6 +22,12 @@ def redis_load_mock_data(redis):
     redis.sadd("packages:SNAPSHOT:SNAPSHOT:ath79/generic", "vim", "tmux")
     redis.sadd("packages:SNAPSHOT:SNAPSHOT:x86/64", "vim", "tmux")
 
+    redis.sadd("branches", "SNAPSHOT", "1.2", "21.02", "19.07")
+    redis.sadd("versions:SNAPSHOT", "SNAPSHOT")
+    redis.sadd("versions:1.2", "1.2.3")
+    redis.sadd("versions:21.02", "21.02.7", "21.02.0", "21.02.0-rc4", "21.02-SNAPSHOT")
+    redis.sadd("versions:19.07", "19.07.7", "19.07.6")
+
     redis.sadd("profiles:21.02:21.02.7:ath79/generic", "tplink_tl-wdr4300-v1")
     redis.sadd("packages:21.02:21.02.7:ath79/generic", "vim", "tmux")
     redis.sadd("packages:21.02:21.02.7:x86/64", "vim", "tmux")
@@ -30,9 +36,16 @@ def redis_load_mock_data(redis):
         "mapping:1.2:1.2.3:testtarget/testsubtarget",
         mapping={"testvendor,testprofile": "testprofile"},
     )
-    redis.sadd("targets:1.2", "testtarget/testsubtarget")
-    redis.sadd("targets:SNAPSHOT", "ath79/generic", "x86/64")
-    redis.sadd("targets:21.02", "testtarget/testsubtarget", "ath79/generic", "x86/64")
+    redis.hset("targets:1.2", mapping={"testtarget/testsubtarget": "testarch"})
+    redis.hset("targets:SNAPSHOT", mapping={"ath79/generic": "", "x86/64": ""})
+    redis.hset(
+        "targets:21.02",
+        mapping={
+            "testtarget/testsubtarget": "testarch",
+            "ath79/generic": "",
+            "x86/64": "",
+        },
+    )
     redis.hset("mapping-abi", mapping={"test1-1": "test1"})
 
 
diff --git a/tests/test_janitor.py b/tests/test_janitor.py
index 2535bbf4..e55a3b9e 100644
--- a/tests/test_janitor.py
+++ b/tests/test_janitor.py
@@ -13,6 +13,7 @@ def upstream(httpserver):
         "packages/testarch/base/Packages.manifest",
         "targets/testtarget/testsubtarget/packages/Packages.manifest",
         "targets/testtarget/testsubtarget/profiles.json",
+        ".targets.json",
     ]
 
     for f in expected_file_requests:
@@ -20,19 +21,6 @@ def upstream(httpserver):
             (upstream_path / f).read_bytes()
         )
 
-    httpserver.expect_request(
-        f"{base_url}/targets", query_string="json-targets"
-    ).respond_with_json(["testtarget/testsubtarget"])
-
-
-def test_update_branch(app, upstream):
-    # with app.app_context():
-    update_branch(
-        {**app.config, "JSON_PATH": app.config["PUBLIC_PATH"] / "json/v1"},
-        app.config["BRANCHES"]["SNAPSHOT"],
-    )
-    assert (app.config["PUBLIC_PATH"] / "json/v1/snapshots/overview.json").is_file()
-
 
 def test_update_meta_latest_json(app):
     with app.app_context():
diff --git a/tests/test_package_changes.py b/tests/test_package_changes.py
index 7935f9f6..583c467d 100644
--- a/tests/test_package_changes.py
+++ b/tests/test_package_changes.py
@@ -1,4 +1,3 @@
-
 from asu.package_changes import appy_package_changes
 
 
@@ -53,6 +52,7 @@ def test_apply_package_changes_release():
 
     assert req == original_req
 
+
 def test_apply_package_changes_mediatek():
     req = {
         "version": "23.05",
diff --git a/tests/upstream/snapshots/.targets.json b/tests/upstream/snapshots/.targets.json
new file mode 100644
index 00000000..85ef5bba
--- /dev/null
+++ b/tests/upstream/snapshots/.targets.json
@@ -0,0 +1 @@
+{"testtarget/testsubtarget": "testarch"}