release 0.9.0

CHANGELOG.md

@@ -1,9 +1,8 @@
-1.0.0 (2022-05-28)
+0.9.0 (2022-05-26)
 ------------------
 
- - all documented interfaces are now considered stable
  - allow file:// mirrors
- - /var/cache/apt/archives/ is now allowed to contain *.deb packages
+ - /var/cache/apt/archives/ is now allowed to contain packages
  - add file-mirror-automount hook-dir
  - set $MMDEBSTRAP_VERBOSITY in hooks
  - rewrite coverage with multiple individual and skippable shell scripts

coverage.py

@@ -6,9 +6,6 @@ import sys
 import shutil
 import subprocess
 import argparse
-import time
-from datetime import timedelta
-from collections import defaultdict
 
 have_qemu = os.getenv("HAVE_QEMU", "yes") == "yes"
 have_unshare = os.getenv("HAVE_UNSHARE", "yes") == "yes"
@@ -17,7 +14,7 @@ run_ma_same_tests = os.getenv("RUN_MA_SAME_TESTS", "yes") == "yes"
 
 default_dist = os.getenv("DEFAULT_DIST", "unstable")
 all_dists = ["oldstable", "stable", "testing", "unstable"]
-default_mode = "auto" if have_unshare else "root"
+default_mode = "unshare" if have_unshare else "root"
 all_modes = ["auto", "root", "unshare", "fakechroot", "chrootless"]
 default_variant = "apt"
 all_variants = [
@@ -38,20 +35,18 @@ only_dists = []
 mirror = os.getenv("mirror", "http://127.0.0.1/debian")
 hostarch = subprocess.check_output(["dpkg", "--print-architecture"]).decode().strip()
 
-separator = (
-    "------------------------------------------------------------------------------"
-)
-
 
 def skip(condition, dist, mode, variant, fmt):
     if not condition:
-        return ""
+        return False
+    toskip = False
     for line in condition.splitlines():
         if not line:
             continue
         if eval(line):
-            return line.strip()
+            toskip = True
-    return ""
+            break
+    return toskip
 
 
 def main():
@@ -84,8 +79,19 @@ def main():
     with open("coverage.txt") as f:
         for test in Deb822.iter_paragraphs(f):
             name = test["Test"]
-            if args.test and name not in args.test:
+            if args.test and name not in args.text:
                 continue
+            tt = None
+            if have_qemu:
+                tt = "qemu"
+            elif test.get("Needs-QEMU", "false") == "true":
+                tt = "skip"
+            elif test.get("Needs-Root", "false") == "true":
+                tt = "sudo"
+            elif have_unshare:
+                tt = "null"
+            else:
+                tt = "sudo"
             dists = test.get("Dists", default_dist)
             if dists == "any":
                 dists = all_dists
@@ -120,43 +126,24 @@ def main():
                 for mode in modes:
                     for variant in variants:
                         for fmt in formats:
-                            skipreason = skip(
+                            if skip(test.get("Skip-If"), dist, mode, variant, fmt):
-                                test.get("Skip-If"), dist, mode, variant, fmt
+                                tt = "skip"
-                            )
-                            if skipreason:
-                                tt = ("skip", skipreason)
-                            elif have_qemu:
-                                tt = "qemu"
-                            elif test.get("Needs-QEMU", "false") == "true":
-                                tt = ("skip", "test needs QEMU")
-                            elif test.get("Needs-Root", "false") == "true":
-                                tt = "sudo"
-                            elif mode == "auto" and not have_unshare:
-                                tt = "sudo"
-                            elif mode == "root":
-                                tt = "sudo"
-                            elif mode == "unshare" and not have_unshare:
-                                tt = ("skip", "test needs unshare")
-                            else:
-                                tt = "null"
                             tests.append((tt, name, dist, mode, variant, fmt))
 
-    starttime = time.time()
+    skipped = []
-    skipped = defaultdict(list)
     failed = []
     for i, (test, name, dist, mode, variant, fmt) in enumerate(tests):
-        print(separator, file=sys.stderr)
+        print(
-        print("(%d/%d) %s" % (i + 1, len(tests), name), file=sys.stderr)
+            "------------------------------------------------------------------------------"
-        print("dist: %s" % dist, file=sys.stderr)
+        )
-        print("mode: %s" % mode, file=sys.stderr)
+        print("(%d/%d) %s" % (i + 1, len(tests), name))
-        print("variant: %s" % variant, file=sys.stderr)
+        print("dist: %s" % dist)
-        print("format: %s" % fmt, file=sys.stderr)
+        print("mode: %s" % mode)
-        if i > 0:
+        print("variant: %s" % variant)
-            currenttime = time.time()
+        print("format: %s" % fmt)
-            timeleft = timedelta(
+        print(
-                seconds=(len(tests) - i) * (currenttime - starttime) / i
+            "------------------------------------------------------------------------------"
         )
-            print("time left: %s" % timeleft, file=sys.stderr)
         with open("tests/" + name) as fin, open("shared/test.sh", "w") as fout:
             for line in fin:
                 for e in ["CMD", "SOURCE_DATE_EPOCH"]:
@@ -176,43 +163,27 @@ def main():
                 argv = ["./run_null.sh", "SUDO"]
             case "null":
                 argv = ["./run_null.sh"]
-            case ("skip", reason):
+            case "skip":
-                skipped[reason].append(
+                skipped.append((name, dist, mode, variant, fmt))
-                    ("(%d/%d) %s" % (i + 1, len(tests), name), dist, mode, variant, fmt)
-                )
-                print(f"skipped because of {reason}", file=sys.stderr)
                 continue
-        print(separator, file=sys.stderr)
         proc = subprocess.Popen(argv)
         try:
             proc.wait()
         except KeyboardInterrupt:
             proc.kill()
             break
-        print(separator, file=sys.stderr)
         if proc.returncode != 0:
-            failed.append(
+            failed.append((name, dist, mode, variant, fmt))
-                ("(%d/%d) %s" % (i + 1, len(tests), name), dist, mode, variant, fmt)
-            )
-            print("result: FAILURE", file=sys.stderr)
-        else:
-            print("result: SUCCESS", file=sys.stderr)
         if args.maxfail and len(failed) >= args.maxfail:
             break
-    print(
-        "successully ran %d tests" % (len(tests) - len(skipped) - len(failed)),
-        file=sys.stderr,
-    )
     if skipped:
-        print("skipped %d:" % len(skipped), file=sys.stderr)
+        print("skipped:")
-        for reason, l in skipped.items():
+        for t in skipped:
-            print(f"skipped because of {reason}:", file=sys.stderr)
+            print(t)
-            for t in l:
-                print(f"    {t}", file=sys.stderr)
     if failed:
-        print("failed %d:" % len(failed), file=sys.stderr)
+        print("failed:")
         for t in failed:
-            print(f"    {t}", file=sys.stderr)
+            print(t)
         exit(1)
 
 

coverage.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-if [ -e ./mmdebstrap -a -e ./taridshift -a -e ./tarfilter -a -e ./coverage.py ]; then
+if [ -e ./mmdebstrap -a -e ./taridshift -a -e ./tarfilter ]; then
 	TMPFILE=$(mktemp)
 	perltidy < ./mmdebstrap > "$TMPFILE"
 	ret=0
@@ -21,7 +21,7 @@ if [ -e ./mmdebstrap -a -e ./taridshift -a -e ./tarfilter -a -e ./coverage.py ];
 
 	perlcritic --severity 4 --verbose 8 ./mmdebstrap
 
-	black --check ./taridshift ./tarfilter ./coverage.py
+	black --check ./taridshift ./tarfilter
 fi
 
 mirrordir="./shared/cache/debian"

coverage.txt

@@ -1,10 +1,8 @@
 Test: check-against-debootstrap-dist
 Dists: any
 Variants: minbase buildd -
-Needs-Root: true
 
 Test: as-debootstrap-unshare-wrapper
-Needs-QEMU: true
 
 Test: help
 

mmdebstrap

@@ -23,7 +23,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '1.0.0';
+our $VERSION = '0.9.0';
 
 use English;
 use Getopt::Long;
@@ -1072,7 +1072,7 @@ sub run_chroot {
                         }
                         push @cleanup_tasks, sub {
                             unlink "$options->{root}/dev/$fname"
-                              or warning("cannot unlink ./dev/$fname: $!");
+                              or warn "cannot unlink ./dev/$fname: $!";
                         };
                         symlink $linkname, "$options->{root}/dev/$fname"
                           or error
@@ -1114,9 +1114,9 @@ sub run_chroot {
                         push @cleanup_tasks, sub {
                             0 == system('umount', @umountopts,
                                 "$options->{root}/dev/$fname")
-                              or warning("umount ./dev/$fname failed: $?");
+                              or warn "umount ./dev/$fname failed: $?";
                             unlink "$options->{root}/dev/$fname"
-                              or warning("cannot unlink ./dev/$fname: $!");
+                              or warn "cannot unlink ./dev/$fname: $!";
                         };
                         0 == system('mount', '-o', 'bind', "/dev/$fname",
                             "$options->{root}/dev/$fname")
@@ -1150,7 +1150,7 @@ sub run_chroot {
                         # was already created in the run_setup function.
                         push @cleanup_tasks, sub {
                             rmdir "$options->{root}/dev/$fname"
-                              or warning("cannot rmdir ./dev/$fname: $!");
+                              or warn "cannot rmdir ./dev/$fname: $!";
                         };
                         if (-e "$options->{root}/dev/$fname") {
                             if (!-d "$options->{root}/dev/$fname") {
@@ -1185,7 +1185,7 @@ sub run_chroot {
                     push @cleanup_tasks, sub {
                         0 == system('umount', @umountopts,
                             "$options->{root}/dev/$fname")
-                          or warning("umount ./dev/$fname failed: $?");
+                          or warn "umount ./dev/$fname failed: $?";
                     };
                     0 == system('mount', '-o', 'bind', "/dev/$fname",
                         "$options->{root}/dev/$fname")
@@ -1236,7 +1236,7 @@ sub run_chroot {
             ) {
                 push @cleanup_tasks, sub {
                     0 == system('umount', "$options->{root}/sys")
-                      or warning("umount /sys failed: $?");
+                      or warn "umount /sys failed: $?";
                 };
             } elsif (
                 0 == system('mount', '-o', 'rbind', '/sys',
@@ -1247,7 +1247,7 @@ sub run_chroot {
                     0 == system(
                         'umount', '--no-mtab',
                         '--lazy', "$options->{root}/sys"
-                    ) or warning("umount /sys failed: $?");
+                    ) or warn "umount /sys failed: $?";
                 };
             } else {
                 error "mount /sys failed: $?";
@@ -1263,7 +1263,7 @@ sub run_chroot {
                 # unmounting /sys only seems to be successful with --lazy
                 0 == system('umount', '--no-mtab', '--lazy',
                     "$options->{root}/sys")
-                  or warning("umount /sys failed: $?");
+                  or warn "umount /sys failed: $?";
             };
             # without the network namespace unshared, we cannot mount a new
             # sysfs. Since we need network, we just bind-mount.
@@ -1317,11 +1317,11 @@ sub run_chroot {
                     ) {
                         0 == system('umount',
                             "$options->{root}/proc/sys/fs/binfmt_misc")
-                          or warning(
+                          or error
-                            "umount /proc/sys/fs/binfmt_misc failed: $?");
+                          "umount /proc/sys/fs/binfmt_misc failed: $?";
                     }
                     0 == system('umount', "$options->{root}/proc")
-                      or warning("umount /proc failed: $?");
+                      or error "umount /proc failed: $?";
                 };
             } elsif (
                 0 == system('mount', '-t', 'proc', 'proc',
@@ -1329,7 +1329,7 @@ sub run_chroot {
                 push @cleanup_tasks, sub {
                     # since we cannot write to /etc/mtab we need --no-mtab
                     0 == system('umount', '--no-mtab', "$options->{root}/proc")
-                      or warning("umount /proc failed: $?");
+                      or error "umount /proc failed: $?";
                 };
             } else {
                 error "mount /proc failed: $?";
@@ -1343,7 +1343,7 @@ sub run_chroot {
             push @cleanup_tasks, sub {
                 # since we cannot write to /etc/mtab we need --no-mtab
                 0 == system('umount', '--no-mtab', "$options->{root}/proc")
-                  or warning("umount /proc failed: $?");
+                  or error "umount /proc failed: $?";
             };
             0 == system('mount', '-t', 'proc', 'proc', "$options->{root}/proc")
               or error "mount /proc failed: $?";

tests/aptopt

@@ -1,9 +1,9 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot; rm -f /tmp/config" EXIT INT TERM
 echo 'Acquire::Languages "none";' > /tmp/config
 {{ CMD }} --mode=root --variant=apt --aptopt='Acquire::Check-Valid-Until "false"' --aptopt=/tmp/config {{ DIST }} /tmp/debian-chroot {{ MIRROR }}
 printf 'Acquire::Check-Valid-Until "false";\nAcquire::Languages "none";\n' | cmp /tmp/debian-chroot/etc/apt/apt.conf.d/99mmdebstrap -
 rm /tmp/debian-chroot/etc/apt/apt.conf.d/99mmdebstrap
 tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u tar1.txt -
+rm -r /tmp/debian-chroot /tmp/config

tests/aspcud-apt-solver

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
 {{ CMD }} --mode={{ MODE }} --variant=custom \
     --include $(cat pkglist.txt | tr '\n' ',') \
     --aptopt='APT::Solver "aspcud"' \
@@ -9,3 +8,4 @@ trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
 tar -tf /tmp/debian-chroot.tar | sort \
     | grep -v '^./etc/apt/apt.conf.d/99mmdebstrap$' \
     | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar

tests/chroot-directory-not-accessible-by-apt-user

@@ -1,8 +1,8 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot" EXIT INT TERM
 mkdir /tmp/debian-chroot
 chmod 700 /tmp/debian-chroot
 {{ CMD }} --mode=root --variant=apt {{ DIST }} /tmp/debian-chroot {{ MIRROR }}
 tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u tar1.txt -
+rm -r /tmp/debian-chroot

tests/create-tarball-dry-run

@@ -7,7 +7,7 @@ set -eu
 export LC_ALL=C.UTF-8
 prefix=
 include=
-if [ "$(id -u)" -eq 0 ] && [ "{{ MODE }}" != root ] && [ "{{ MODE }}" != auto ]; then
+if [ "$(id -u)" -eq 0 ] && [ "{{ MODE }}" != root ]; then
 	# this must be qemu
 	if ! id -u user >/dev/null 2>&1; then
 		if [ ! -e /mmdebstrap-testenv ]; then

tests/customize-hook

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot; rm -f /tmp/customize.sh" EXIT INT TERM
 cat << 'SCRIPT' > /tmp/customize.sh
 #!/bin/sh
 chroot "$1" whoami > "$1/output2"
@@ -14,3 +13,5 @@ printf "root\n/\n" | cmp /tmp/debian-chroot/output2
 rm /tmp/debian-chroot/output1
 rm /tmp/debian-chroot/output2
 tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u tar1.txt -
+rm /tmp/customize.sh
+rm -r /tmp/debian-chroot

tests/deb822-1-2

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot; rm -f /tmp/sources.list /tmp/deb822.sources" EXIT INT TERM
 cat << SOURCES > /tmp/deb822.sources
 Types: deb
 URIs: {{ MIRROR }}1
@@ -43,3 +42,5 @@ tar -C /tmp/debian-chroot --one-file-system -c . \
 			| grep -v "^./etc/apt/sources.list.d/0002sources.list";
 		printf "./etc/apt/sources.list\n";
 	} | sort | diff -u tar1.txt -
+rm -r /tmp/debian-chroot
+rm /tmp/sources.list /tmp/deb822.sources

tests/deb822-2-2

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot; rm -f /tmp/sources /tmp/deb822" EXIT INT TERM
 cat << SOURCES > /tmp/deb822
 Types: deb
 URIs: {{ MIRROR }}1
@@ -42,3 +41,5 @@ tar -C /tmp/debian-chroot --one-file-system -c . \
 			| grep -v "^./etc/apt/sources.list.d/0002sources.list$";
 		printf "./etc/apt/sources.list\n";
 	} | sort | diff -u tar1.txt -
+rm -r /tmp/debian-chroot
+rm /tmp/sources /tmp/deb822

tests/debug-output-on-fake-tty

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
 script -qfc "{{ CMD }} --mode={{ MODE }} --debug --variant=apt {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }}" /dev/null
 tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar

tests/directory-ending-in-tar

@@ -2,7 +2,6 @@
 set -eu
 export LC_ALL=C.UTF-8
 [ "$(whoami)" = "root" ]
-trap "rm -rf /tmp/debian-chroot.tar" EXIT INT TERM
 {{ CMD }} --mode={{ MODE }} --variant=apt --format=directory {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }}
 ftype=$(stat -c %F /tmp/debian-chroot.tar)
 if [ "$ftype" != directory ]; then
@@ -10,3 +9,4 @@ if [ "$ftype" != directory ]; then
 	exit 1
 fi
 tar -C /tmp/debian-chroot.tar --one-file-system -c . | tar -t | sort | diff -u tar1.txt -
+rm -r /tmp/debian-chroot.tar

tests/dist-using-codename

@@ -4,8 +4,9 @@
 
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -f Release; rm -rf /tmp/debian-chroot" EXIT INT TERM
 /usr/lib/apt/apt-helper download-file "{{ MIRROR }}/dists/{{ DIST }}/Release" Release
 codename=$(awk '/^Codename: / { print $2; }' Release)
+rm Release
 {{ CMD }} --mode={{ MODE }} --variant=apt $codename /tmp/debian-chroot {{ MIRROR }}
 echo "deb {{ MIRROR }} $codename main" | diff -u - /tmp/debian-chroot/etc/apt/sources.list
+rm -rf /tmp/debian-chroot

tests/dpkgopt

@@ -1,10 +1,10 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot; rm -f /tmp/config" EXIT INT TERM
 echo no-pager > /tmp/config
 {{ CMD }} --mode=root --variant=apt --dpkgopt="path-exclude=/usr/share/doc/*" --dpkgopt=/tmp/config --dpkgopt="path-include=/usr/share/doc/dpkg/copyright" {{ DIST }} /tmp/debian-chroot {{ MIRROR }}
 printf 'path-exclude=/usr/share/doc/*\nno-pager\npath-include=/usr/share/doc/dpkg/copyright\n' | cmp /tmp/debian-chroot/etc/dpkg/dpkg.cfg.d/99mmdebstrap -
 rm /tmp/debian-chroot/etc/dpkg/dpkg.cfg.d/99mmdebstrap
 tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort > tar2.txt
 { grep -v '^./usr/share/doc/.' tar1.txt; echo ./usr/share/doc/dpkg/; echo ./usr/share/doc/dpkg/copyright; } | sort | diff -u - tar2.txt
+rm -r /tmp/debian-chroot /tmp/config

tests/essential-hook

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot; rm -f /tmp/essential.sh" EXIT INT TERM
 cat << 'SCRIPT' > /tmp/essential.sh
 #!/bin/sh
 echo tzdata tzdata/Zones/Europe select Berlin | chroot "$1" debconf-set-selections
@@ -18,3 +17,5 @@ tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort \
 	| grep -v '^./var/lib/dpkg/info/tzdata.' \
 	| grep -v '^./var/lib/apt/extended_states$' \
 	| diff -u tar1.txt -
+rm /tmp/essential.sh
+rm -r /tmp/debian-chroot

tests/existing-directory-with-lost-found

@@ -1,9 +1,9 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot" EXIT INT TERM
 mkdir /tmp/debian-chroot
 mkdir /tmp/debian-chroot/lost+found
 {{ CMD }} --mode=root --variant=apt {{ DIST }} /tmp/debian-chroot {{ MIRROR }}
 rmdir /tmp/debian-chroot/lost+found
 tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u tar1.txt -
+rm -r /tmp/debian-chroot

tests/existing-empty-directory

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot" EXIT INT TERM
 mkdir /tmp/debian-chroot
 {{ CMD }} --mode=root --variant=apt {{ DIST }} /tmp/debian-chroot {{ MIRROR }}
 tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u tar1.txt -
+rm -r /tmp/debian-chroot

tests/fail-installing-to-non-empty-lost-found

@@ -1,12 +1,14 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm /tmp/debian-chroot/lost+found/exists; rmdir /tmp/debian-chroot/lost+found /tmp/debian-chroot" EXIT INT TERM
 mkdir /tmp/debian-chroot
 mkdir /tmp/debian-chroot/lost+found
 touch /tmp/debian-chroot/lost+found/exists
 ret=0
 {{ CMD }} --mode={{ MODE }} --variant=apt {{ DIST }} /tmp/debian-chroot {{ MIRROR }} || ret=$?
+rm /tmp/debian-chroot/lost+found/exists
+rmdir /tmp/debian-chroot/lost+found
+rmdir /tmp/debian-chroot
 if [ "$ret" = 0 ]; then
 	echo expected failure but got exit $ret >&2
 	exit 1

tests/fail-installing-to-non-empty-target-directory

@@ -1,12 +1,14 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rmdir /tmp/debian-chroot/lost+found; rm /tmp/debian-chroot/exists; rmdir /tmp/debian-chroot" EXIT INT TERM
 mkdir /tmp/debian-chroot
 mkdir /tmp/debian-chroot/lost+found
 touch /tmp/debian-chroot/exists
 ret=0
 {{ CMD }} --mode={{ MODE }} --variant=apt {{ DIST }} /tmp/debian-chroot {{ MIRROR }} || ret=$?
+rmdir /tmp/debian-chroot/lost+found
+rm /tmp/debian-chroot/exists
+rmdir /tmp/debian-chroot
 if [ "$ret" = 0 ]; then
 	echo expected failure but got exit $ret >&2
 	exit 1

tests/include

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot" EXIT INT TERM
 {{ CMD }} --mode=root --variant=apt --include=doc-debian {{ DIST }} /tmp/debian-chroot {{ MIRROR }}
 rm /tmp/debian-chroot/usr/share/doc-base/debian-*
 rm -r /tmp/debian-chroot/usr/share/doc/debian
@@ -10,3 +9,4 @@ rm /tmp/debian-chroot/var/lib/apt/extended_states
 rm /tmp/debian-chroot/var/lib/dpkg/info/doc-debian.list
 rm /tmp/debian-chroot/var/lib/dpkg/info/doc-debian.md5sums
 tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u tar1.txt -
+rm -r /tmp/debian-chroot

tests/include-with-multiple-apt-sources

@@ -5,6 +5,6 @@
 
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot" EXIT INT TERM
 {{ CMD }} --mode=root --variant=minbase --include=doc-debian unstable /tmp/debian-chroot "deb {{ MIRROR }} unstable main" "deb {{ MIRROR }} stable main"
 chroot /tmp/debian-chroot dpkg-query --show doc-debian
+rm -r /tmp/debian-chroot

tests/keyring-overwrites

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot; rmdir /tmp/emptydir; rm -f /tmp/emptyfile" EXIT INT TERM
 mkdir -p /tmp/emptydir
 touch /tmp/emptyfile
 # this overwrites the apt keyring options and should fail
@@ -9,6 +8,9 @@ ret=0
 {{ CMD }} --mode=root --variant=apt --keyring=/tmp/emptydir --keyring=/tmp/emptyfile {{ DIST }} /tmp/debian-chroot "deb {{ MIRROR }} {{ DIST }} main" || ret=$?
 # make sure that no [signedby=...] managed to make it into the sources.list
 echo "deb {{ MIRROR }} {{ DIST }} main" | cmp /tmp/debian-chroot/etc/apt/sources.list -
+rm -r /tmp/debian-chroot
+rmdir /tmp/emptydir
+rm /tmp/emptyfile
 if [ "$ret" = 0 ]; then
 	echo expected failure but got exit $ret >&2
 	exit 1

tests/merged-usr-via-setup-hook

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot" EXIT INT TERM
 {{ CMD }} --mode=root --variant=apt \
 	--setup-hook=./hooks/merged-usr/setup00.sh \
 	--customize-hook='[ -L "$1"/bin -a -L "$1"/sbin -a -L "$1"/lib ]' \
@@ -41,3 +40,4 @@ tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort > tar2.txt
 		;;
 	esac
 } | sort -u | diff -u - tar2.txt
+rm -r /tmp/debian-chroot

tests/mirror-is-deb

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
 {{ CMD }} --mode={{ MODE }} --variant=apt {{ DIST }} /tmp/debian-chroot.tar "deb {{ MIRROR }} {{ DIST }} main"
 tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar

tests/mirror-is-real-file

@@ -1,9 +1,9 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -f /tmp/debian-chroot.tar /tmp/sources.list" EXIT INT TERM
 echo "deb {{ MIRROR }} {{ DIST }} main" > /tmp/sources.list
 {{ CMD }} --mode={{ MODE }} --variant=apt {{ DIST }} /tmp/debian-chroot.tar /tmp/sources.list
 tar -tf /tmp/debian-chroot.tar \
 	| sed 's#^./etc/apt/sources.list.d/0000sources.list$#./etc/apt/sources.list#' \
 	| sort | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar /tmp/sources.list

tests/mirror-is-stdin

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
 echo "deb {{ MIRROR }} {{ DIST }} main" | {{ CMD }} --mode={{ MODE }} --variant=apt {{ DIST }} /tmp/debian-chroot.tar -
 tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar

tests/multiple-include

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot" EXIT INT TERM
 {{ CMD }} --mode=root --variant=apt --include=doc-debian --include=tzdata {{ DIST }} /tmp/debian-chroot {{ MIRROR }}
 rm /tmp/debian-chroot/usr/share/doc-base/debian-*
 rm -r /tmp/debian-chroot/usr/share/doc/debian
@@ -21,3 +20,4 @@ rm /tmp/debian-chroot/var/lib/dpkg/info/tzdata.postinst
 rm /tmp/debian-chroot/var/lib/dpkg/info/tzdata.postrm
 rm /tmp/debian-chroot/var/lib/dpkg/info/tzdata.templates
 tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u tar1.txt -
+rm -r /tmp/debian-chroot

tests/not-having-to-install-apt-in-include-because-a-hook-did-it-before

@@ -1,9 +1,9 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
 {{ CMD }} --mode={{ MODE }} --variant=essential --include=apt \
 	--essential-hook='APT_CONFIG=$MMDEBSTRAP_APT_CONFIG apt-get update' \
 	--essential-hook='APT_CONFIG=$MMDEBSTRAP_APT_CONFIG apt-get --yes install -oDPkg::Chroot-Directory="$1" apt' \
 	{{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }}
 tar -tf /tmp/debian-chroot.tar | sort | grep -v ./var/lib/apt/extended_states | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar

tests/progress-bars-on-fake-tty

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
 script -qfc "{{ CMD }} --mode={{ MODE }} --variant=apt {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }}" /dev/null
 tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar

tests/read-from-stdin-write-to-stdout

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm /tmp/debian-chroot.tar" EXIT INT TERM
 echo "deb {{ MIRROR }} {{ DIST }} main" | {{ CMD }} --mode={{ MODE }} --variant=apt > /tmp/debian-chroot.tar
 tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar

tests/remove-start-stop-daemon-and-policy-rc-d-in-hook

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
 {{ CMD }} --mode={{ MODE }} --variant=apt --customize-hook='rm "$1/usr/sbin/policy-rc.d"; rm "$1/sbin/start-stop-daemon"' {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }}
 tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar

tests/signed-by-with-host-keys

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot" EXIT INT TERM
 {{ CMD }} --mode=root --variant=apt {{ DIST }} /tmp/debian-chroot {{ MIRROR }}
 printf 'deb {{ MIRROR }} {{ DIST }} main\n' | cmp /tmp/debian-chroot/etc/apt/sources.list -
 tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u tar1.txt -
+rm -r /tmp/debian-chroot

tests/supply-components-manually

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -rf /tmp/debian-chroot" EXIT INT TERM
 {{ CMD }} --mode={{ MODE }} --variant=apt --components="main main" --comp="main,main" {{ DIST }} /tmp/debian-chroot {{ MIRROR }}
 echo "deb {{ MIRROR }} {{ DIST }} main" | cmp /tmp/debian-chroot/etc/apt/sources.list
 tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u tar1.txt -
+rm -r /tmp/debian-chroot

tests/taridshift-utility

@@ -5,7 +5,6 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	echo "this test modifies the system and should only be run inside a container" >&2
 	exit 1
 fi
-trap "rm -f /tmp/debian-chroot.tar /tmp/debian-chroot-shifted.tar /tmp/debian-chroot.txt /tmp/debian-chroot-shiftedback.tar /tmp/expected; rm -rf /tmp/debian-chroot" EXIT INT TERM
 adduser --gecos user --disabled-password user
 echo user:100000:65536 | cmp /etc/subuid -
 echo user:100000:65536 | cmp /etc/subgid -
@@ -57,3 +56,5 @@ runuser -u user -- {{ CMD }} --unshare-helper /usr/sbin/chroot /tmp/debian-chroo
 echo "/bin/ping cap_net_raw=ep" > /tmp/expected
 runuser -u user -- {{ CMD }} --unshare-helper /usr/sbin/chroot /tmp/debian-chroot getcap /bin/ping \
 	| diff -u /tmp/expected -
+rm /tmp/debian-chroot.tar /tmp/debian-chroot-shifted.tar /tmp/debian-chroot.txt /tmp/debian-chroot-shiftedback.tar /tmp/expected
+rm -r /tmp/debian-chroot

tests/unshare-as-root-user

@@ -2,8 +2,8 @@
 set -eu
 export LC_ALL=C.UTF-8
 [ "$(whoami)" = "root" ]
-trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
 {{ CMD }} --mode=unshare --variant=apt \
 	--customize-hook='chroot "$1" sh -c "test -e /proc/self/fd"' \
 	{{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }}
 tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar

tests/unshare-as-root-user-inside-chroot

@@ -8,7 +8,6 @@
 set -eu
 export LC_ALL=C.UTF-8
 [ "$(whoami)" = "root" ]
-trap "rm -f /tmp/debian-chroot.tar script.sh" EXIT INT TERM
 cat << 'SCRIPT' > script.sh
 #!/bin/sh
 set -eu
@@ -26,3 +25,4 @@ chmod +x script.sh
 	--customize-hook="download /tmp/debian-chroot.tar /tmp/debian-chroot.tar" \
 	{{ DIST }} /dev/null {{ MIRROR }}
 tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar script.sh

tests/without-etc-resolv-conf-and-etc-hostname

@@ -5,10 +5,10 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	echo "this test modifies the system and should only be run inside a container" >&2
 	exit 1
 fi
-trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
 rm /etc/resolv.conf /etc/hostname
 {{ CMD }} --mode={{ MODE }} --variant=apt {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }}
 { tar -tf /tmp/debian-chroot.tar;
   printf "./etc/hostname\n";
   printf "./etc/resolv.conf\n";
 } | sort | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar

tests/xz-compressed-tarball

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 export LC_ALL=C.UTF-8
-trap "rm -f /tmp/debian-chroot.tar.xz" EXIT INT TERM
 {{ CMD }} --mode={{ MODE }} --variant=apt {{ DIST }} /tmp/debian-chroot.tar.xz {{ MIRROR }}
 printf '\3757zXZ\0' | cmp --bytes=6 /tmp/debian-chroot.tar.xz -
 tar -tf /tmp/debian-chroot.tar.xz | sort | diff -u tar1.txt -
+rm /tmp/debian-chroot.tar.xz