fixup! tests

UpstreamDataInc · Sep 11, 2024 · 4a48a30 · 4a48a30
1 parent 1c0054c
commit 4a48a30
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 6 deletions.
diff --git a/goosebit/updates/swdesc/rauc.py b/goosebit/updates/swdesc/rauc.py
@@ -32,11 +32,14 @@ async def parse_file(file: Path):
 def parse_descriptor(manifest: configparser.ConfigParser):
     swdesc_attrs = {}
     try:
-        # specified as optional in the RAUC docs
-        swdesc_attrs["version"] = semver.Version.parse(manifest["update"].get("version"))
-        swdesc_attrs["compatibility"] = [{"hw_model": "default", "hw_revision": manifest["update"]["compatible"]}]
-    except KeyError as e:
-        logger.warning(f"Parsing RAUC descriptor failed, error={e}")
-        raise ValueError("Parsing RAUC descriptor failed", e)
+        swdesc_attrs["version"] = semver.Version.parse(manifest["system"].get("version"))
+        swdesc_attrs["compatibility"] = [{"hw_model": "default", "hw_revision": manifest["system"]["compatible"]}]
+    except KeyError:
+        try:
+            swdesc_attrs["version"] = semver.Version.parse(manifest["update"].get("version"))
+            swdesc_attrs["compatibility"] = [{"hw_model": "default", "hw_revision": manifest["update"]["compatible"]}]
+        except KeyError as e:
+            logger.warning(f"Parsing RAUC descriptor failed, error={e}")
+            raise ValueError("Parsing RAUC descriptor failed", e)
 
     return swdesc_attrs
diff --git a/tests/updates/rauc/__init__.py b/tests/updates/rauc/__init__.py
diff --git a/tests/updates/software-header.swu → tests/updates/rauc/software-header.swu b/tests/updates/software-header.swu → tests/updates/rauc/software-header.swu
diff --git a/tests/updates/test_swdesc.py → tests/updates/rauc/test_swdesc.py b/tests/updates/test_swdesc.py → tests/updates/rauc/test_swdesc.py
diff --git a/tests/updates/swu/__init__.py b/tests/updates/swu/__init__.py
diff --git a/tests/updates/swu/software-header.raucb b/tests/updates/swu/software-header.raucb
diff --git a/tests/updates/swu/test_swdesc.py b/tests/updates/swu/test_swdesc.py
@@ -0,0 +1,14 @@
+import pytest
+from anyio import Path
+
+from goosebit.updates.swdesc.rauc import parse_file
+
+
+@pytest.mark.asyncio
+async def test_parse_software_header():
+    resolved = await Path(__file__).resolve()
+    swdesc_attrs = await parse_file(resolved.parent / "software-header.raucb")
+    assert str(swdesc_attrs["version"]) == "8.8.1-11-g8c926e5+188370"
+    assert swdesc_attrs["compatibility"] == [
+        {"hw_model": "default", "hw_revision": "rauc-test-goosebit"},
+    ]