From fdded58cdd8ec4ec7feb3b09598fd6febaca1e1d Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Tue, 11 Aug 2020 17:07:39 +0200
Subject: [PATCH] test/assembler: check for ostree version metadata

Set the OS version of the commit via the new `os_version` option
and make sure that it is in the compose info as well as in the
commit metadata.
---
 test/data/manifests/fedora-ostree-commit.json     |  3 ++-
 test/data/manifests/mpp-fedora-ostree-commit.json |  3 ++-
 test/run/test_assemblers.py                       | 12 ++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/test/data/manifests/fedora-ostree-commit.json b/test/data/manifests/fedora-ostree-commit.json
index 0986f2db..a5580532 100644
--- a/test/data/manifests/fedora-ostree-commit.json
+++ b/test/data/manifests/fedora-ostree-commit.json
@@ -682,7 +682,8 @@
     "assembler": {
       "name": "org.osbuild.ostree.commit",
       "options": {
-        "ref": "fedora/x86_64/osbuild"
+        "ref": "fedora/x86_64/osbuild",
+        "os_version": "32"
       }
     }
   },
diff --git a/test/data/manifests/mpp-fedora-ostree-commit.json b/test/data/manifests/mpp-fedora-ostree-commit.json
index 8c3686bb..4af37c44 100644
--- a/test/data/manifests/mpp-fedora-ostree-commit.json
+++ b/test/data/manifests/mpp-fedora-ostree-commit.json
@@ -97,7 +97,8 @@
     "assembler": {
       "name": "org.osbuild.ostree.commit",
       "options": {
-        "ref": "fedora/x86_64/osbuild"
+        "ref": "fedora/x86_64/osbuild",
+        "os_version": "32"
       }
     }
   }
diff --git a/test/run/test_assemblers.py b/test/run/test_assemblers.py
index 77e214b9..80ce7a59 100644
--- a/test/run/test_assemblers.py
+++ b/test/run/test_assemblers.py
@@ -127,9 +127,11 @@ class TestAssemblers(test.TestBase):
                 commit_id = compose["ostree-commit"]
                 ref = compose["ref"]
                 rpmostree_inputhash = compose["rpm-ostree-inputhash"]
+                os_version = compose["ostree-version"]
                 assert commit_id
                 assert ref
                 assert rpmostree_inputhash
+                assert os_version
 
                 md = subprocess.check_output(
                     [
@@ -141,6 +143,16 @@ class TestAssemblers(test.TestBase):
                     ], encoding="utf-8").strip()
                 self.assertEqual(md, f"'{rpmostree_inputhash}'")
 
+                md = subprocess.check_output(
+                    [
+                        "ostree",
+                        "show",
+                        "--repo", repo,
+                        "--print-metadata-key=version",
+                        commit_id
+                    ], encoding="utf-8").strip()
+                self.assertEqual(md, f"'{os_version}'")
+
     @unittest.skipUnless(test.TestBase.have_tree_diff(), "tree-diff missing")
     def test_qemu(self):
         loctl = loop.LoopControl()