From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 1 Dec 2022 16:15:10 +0000 (+0100)
Subject: test-loop-block: tighten tests a bit - check fstype, too
X-Git-Tag: v253-rc1~394^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02c15120a17b18c4af49d62086374622431d8cf4;p=thirdparty%2Fsystemd.git

test-loop-block: tighten tests a bit - check fstype, too

Let's verify that we properly created the file systems once we did so.
And tets this way that our dissector works correctly.
---

diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c
index af2a9683a43..200cf2ba033 100644
--- a/src/test/test-loop-block.c
+++ b/src/test/test-loop-block.c
@@ -44,6 +44,15 @@ static void verify_dissected_image(DissectedImage *dissected) {
         assert_se(dissected->partitions[PARTITION_HOME].node);
 }
 
+static void verify_dissected_image_harder(DissectedImage *dissected) {
+        verify_dissected_image(dissected);
+
+        assert_se(streq(dissected->partitions[PARTITION_ESP].fstype, "vfat"));
+        assert_se(streq(dissected->partitions[PARTITION_XBOOTLDR].fstype, "vfat"));
+        assert_se(streq(dissected->partitions[PARTITION_ROOT].fstype, "ext4"));
+        assert_se(streq(dissected->partitions[PARTITION_HOME].fstype, "ext4"));
+}
+
 static void* thread_func(void *ptr) {
         int fd = PTR_TO_FD(ptr);
         int r;
@@ -247,7 +256,7 @@ static int run(int argc, char *argv[]) {
 
         dissected = dissected_image_unref(dissected);
         assert_se(dissect_loop_device(loop, NULL, NULL, DISSECT_IMAGE_ADD_PARTITION_DEVICES|DISSECT_IMAGE_PIN_PARTITION_DEVICES, &dissected) >= 0);
-        verify_dissected_image(dissected);
+        verify_dissected_image_harder(dissected);
 
         assert_se(mkdtemp_malloc(NULL, &mounted) >= 0);