Merging upstream version 1.53.0+ds1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 39 insertions, 0 deletions

diff --git a/tests/image-dirs.bats b/tests/image-dirs.bats
new file mode 100644
index 0000000..64f799e
--- /dev/null
+++ b/tests/image-dirs.bats
@@ -0,0 +1,39 @@
+#!/usr/bin/env bats
+
+load helpers
+
+@test "image-dirs" {
+	# Create a layer.
+	run storage --debug=false create-layer
+	[ "$status" -eq 0 ]
+	[ "$output" != "" ]
+	layer=$output
+
+	# Check that the layer can be found.
+	storage exists -l $layer
+
+	# Create an image using the layer.
+	run storage --debug=false create-image -m danger $layer
+	[ "$status" -eq 0 ]
+	[ "$output" != "" ]
+	image=${output%%	*}
+
+	# Check that the image can be found.
+	storage exists -i $image
+
+	# Check that the image's user data directory is somewhere under the root.
+	run storage --debug=false get-image-dir $image
+	[ "$status" -eq 0 ]
+	[ "$output" != "" ]
+	dir=${output%%	*}
+	touch "$dir"/dirfile
+	echo "$dir"/dirfile | grep -q ^"${TESTDIR}/root/"
+
+	# Check that the image's user run data directory is somewhere under the run root.
+	run storage --debug=false get-image-run-dir $image
+	[ "$status" -eq 0 ]
+	[ "$output" != "" ]
+	rundir=${output%%	*}
+	touch "$rundir"/rundirfile
+	echo "$rundir"/rundirfile | grep -q ^"${TESTDIR}/runroot/"
+}