From aca5671eb19fdf5e43784ffb5223e7358e5a6537 Mon Sep 17 00:00:00 2001
From: Luca BRUNO <luca.bruno@coreos.com>
Date: Thu, 3 Mar 2022 11:12:00 +0000
Subject: [PATCH] tests/basic-bare-split-xattrs: add fixture, check read logic

---
 Makefile-tests.am                             |   1 +
 tests/fixtures/bare-split-xattrs/basic.tar.xz | Bin 0 -> 2504 bytes
 tests/test-basic-bare-split-xattrs.sh         |  28 ++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 tests/fixtures/bare-split-xattrs/basic.tar.xz

diff --git a/Makefile-tests.am b/Makefile-tests.am
index 5c97bd84..5d39ee5e 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -202,6 +202,7 @@ dist_installed_test_data = tests/archive-test.sh \
 	tests/ostree-path-traverse.tar.gz \
 	tests/pre-signed-pull-data.tar.gz \
 	tests/libtest-core.sh \
+	tests/fixtures/bare-split-xattrs/basic.tar.xz \
 	$(NULL)
 
 EXTRA_DIST += tests/libtest.sh
diff --git a/tests/fixtures/bare-split-xattrs/basic.tar.xz b/tests/fixtures/bare-split-xattrs/basic.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..cec6717e4498565ccf027af48cbe870e14c83545
GIT binary patch
literal 2504
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
SsaS%s#Ao{g000001X)^rbidXB

literal 0
HcmV?d00001

diff --git a/tests/test-basic-bare-split-xattrs.sh b/tests/test-basic-bare-split-xattrs.sh
index 1eeb3039..ac8ebffd 100755
--- a/tests/test-basic-bare-split-xattrs.sh
+++ b/tests/test-basic-bare-split-xattrs.sh
@@ -9,6 +9,15 @@ set -euo pipefail
 mode="bare-split-xattrs"
 OSTREE="${CMD_PREFIX} ostree --repo=${test_tmpdir}/repo"
 
+SUDO="sudo --non-interactive"
+PRIVILEGED="false"
+if [ $(id -u) -eq 0 ]; then
+  PRIVILEGED="true"
+  SUDO=""
+elif $(${SUDO} -v); then
+  PRIVILEGED="true"
+fi
+
 cd ${test_tmpdir}
 ${OSTREE} init --mode "${mode}"
 ${OSTREE} config get core.mode > mode.txt
@@ -44,4 +53,23 @@ fi
 tap_ok "commit exp override"
 rm -rf -- repo files
 
+if [ "${PRIVILEGED}" = "true" ]; then
+    COMMIT="d614c428015227259031b0f19b934dade908942fd71c49047e0daa70e7800a5d"
+    cd ${test_tmpdir}
+    ${SUDO} tar --same-permissions --same-owner -xaf ${test_srcdir}/fixtures/bare-split-xattrs/basic.tar.xz
+    ${SUDO} ${OSTREE} fsck --all
+    ${OSTREE} log ${COMMIT} > out.txt
+    assert_file_has_content_literal out.txt "fixtures: bare-split-xattrs repo"
+    ${OSTREE} ls ${COMMIT} -X /foo > out.txt
+    assert_file_has_content_literal out.txt "{ @a(ayay) [] } /foo"
+    ${OSTREE} ls ${COMMIT} -X /bar > out.txt
+    assert_file_has_content_literal out.txt "{ [(b'user.mykey', [byte 0x6d, 0x79, 0x76, 0x61, 0x6c, 0x75, 0x65])] } /bar"
+    ${OSTREE} ls ${COMMIT} /foolink > out.txt
+    assert_file_has_content_literal out.txt "/foolink -> foo"
+    tap_ok "reading simple fixture"
+    ${SUDO} rm -rf -- repo log.txt
+else
+    tap_ok "reading simple fixture # skip Unable to sudo"
+fi
+
 tap_end