From 7e83726faab0b68eb79c5e35bbd6c336e429625a Mon Sep 17 00:00:00 2001 From: Luca BRUNO Date: Tue, 12 Apr 2022 09:53:54 +0000 Subject: [PATCH] tests: move fixture to fix installed tests This moves around the packed archive for bare-split-xattrs mode, in order to fix installed tests. --- Makefile-tests.am | 2 +- .../basic.tar.xz => bare-split-xattrs-basic.tar.xz} | Bin tests/test-basic-bare-split-xattrs.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename tests/{fixtures/bare-split-xattrs/basic.tar.xz => bare-split-xattrs-basic.tar.xz} (100%) diff --git a/Makefile-tests.am b/Makefile-tests.am index 5d39ee5e..29de6c7a 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am @@ -202,7 +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 \ + tests/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/bare-split-xattrs-basic.tar.xz similarity index 100% rename from tests/fixtures/bare-split-xattrs/basic.tar.xz rename to tests/bare-split-xattrs-basic.tar.xz diff --git a/tests/test-basic-bare-split-xattrs.sh b/tests/test-basic-bare-split-xattrs.sh index ac8ebffd..bf828eb7 100755 --- a/tests/test-basic-bare-split-xattrs.sh +++ b/tests/test-basic-bare-split-xattrs.sh @@ -56,7 +56,7 @@ 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} tar --same-permissions --same-owner -xaf ${test_srcdir}/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"