From 793d8bb5612e425dc9f56fa7eabad17119aa12e7 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Mon, 13 Jun 2022 14:00:44 +0200 Subject: [PATCH] add forgotten test create-directory-dry-run --- coverage.txt | 2 ++ tests/create-directory-dry-run | 25 +++++-------------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/coverage.txt b/coverage.txt index db0c2c4..c496580 100644 --- a/coverage.txt +++ b/coverage.txt @@ -271,6 +271,8 @@ Skip-If: variant == "standard" and dist in ["oldstable", "stable"] # #864082, #1004557, #1004558 variant == "important" and dist == "oldstable" # /var/lib/systemd/catalog/database differs +Test: create-directory-dry-run + Test: create-tarball-dry-run Variants: any Modes: any diff --git a/tests/create-directory-dry-run b/tests/create-directory-dry-run index 56565bd..ad7e046 100644 --- a/tests/create-directory-dry-run +++ b/tests/create-directory-dry-run @@ -1,8 +1,11 @@ -cat << END > shared/test.sh #!/bin/sh set -eu export LC_ALL=C.UTF-8 -{{ CMD }} --mode={{ MODE }} --dry-run --variant=apt --setup-hook="exit 1" --essential-hook="exit 1" --customize-hook="exit 1" {{ DIST }} /tmp/debian-chroot {{ MIRROR }} +{{ CMD }} --mode={{ MODE }} --dry-run --variant=apt \ + --setup-hook="exit 1" \ + --essential-hook="exit 1" \ + --customize-hook="exit 1" \ + {{ DIST }} /tmp/debian-chroot {{ MIRROR }} rm /tmp/debian-chroot/dev/console rm /tmp/debian-chroot/dev/fd rm /tmp/debian-chroot/dev/full @@ -23,21 +26,3 @@ rm /tmp/debian-chroot/var/lib/apt/lists/lock rm /tmp/debian-chroot/var/lib/dpkg/status # the rest should be empty directories that we can rmdir recursively find /tmp/debian-chroot -depth -print0 | xargs -0 rmdir -END -if [ "$HAVE_QEMU" = "yes" ]; then - ./run_qemu.sh - runtests=$((runtests+1)) -elif [ "{{ MODE }}" = "root" ]; then - ./run_null.sh SUDO - runtests=$((runtests+1)) -else - ./run_null.sh - runtests=$((runtests+1)) -fi - -# test all --dry-run variants - -# we are testing all variants here because with 0.7.5 we had a bug: -# mmdebstrap sid /dev/null --simulate ==> E: cannot read /var/cache/apt/archives/ -for variant in extract custom essential apt minbase buildd important standard; do - for mode in root unshare fakechroot proot chrootless; do