From 5533b25255714b04ec15d6256d59cea2cb21e221 Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
Date: Thu, 11 Aug 2022 12:45:00 +0200
Subject: [PATCH] tests/chrootless-essential: enable again now that glibc is
 fixed

---
 coverage.txt                                |  3 +-
 tests/chrootless-essential                  | 13 +++++++
 tests/install-known-good-from-essential-yes | 43 ---------------------
 3 files changed, 14 insertions(+), 45 deletions(-)
 create mode 100644 tests/chrootless-essential
 delete mode 100644 tests/install-known-good-from-essential-yes

diff --git a/coverage.txt b/coverage.txt
index ab05c30..290f076 100644
--- a/coverage.txt
+++ b/coverage.txt
@@ -286,11 +286,10 @@ Test: install-doc-debian
 Modes: chrootless
 Variants: custom
 
-Test: install-known-good-from-essential-yes
+Test: chrootless-essential
 Variants: custom
 Modes: chrootless
 Skip-If:
- True # #1006692
  dist in ["oldstable", "stable"]
 
 Test: install-doc-debian-and-output-tarball
diff --git a/tests/chrootless-essential b/tests/chrootless-essential
new file mode 100644
index 0000000..bfb110b
--- /dev/null
+++ b/tests/chrootless-essential
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -eu
+export LC_ALL=C.UTF-8
+if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
+	if [ ! -e /mmdebstrap-testenv ]; then
+		echo "this test modifies the system and should only be run inside a container" >&2
+		exit 1
+	fi
+	adduser --gecos user --disabled-password user
+fi
+prefix=
+[ "$(id -u)" -eq 0 ] && prefix="runuser -u user --"
+$prefix fakechroot fakeroot {{ CMD }} --mode=chrootless --variant=essential {{ DIST }} /dev/null {{ MIRROR }}
diff --git a/tests/install-known-good-from-essential-yes b/tests/install-known-good-from-essential-yes
deleted file mode 100644
index dd18ece..0000000
--- a/tests/install-known-good-from-essential-yes
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# regularly check whether more packages work with chrootless:
-# for p in $(grep-aptavail -F Essential yes -s Package -n | sort -u); do ./mmdebstrap --             mode=chrootless --variant=custom --include=bsdutils,coreutils,debianutils,diffutils,dpkg,            findutils,grep,gzip,hostname,init-system-helpers,ncurses-base,ncurses-bin,perl-base,sed,             sysvinit-utils,tar,$p unstable /dev/null; done
-#
-# see https://bugs.debian.org/cgi-bin/pkgreport.cgi?users=debian-dpkg@lists.debian.org;tag=dpkg-     root-support
-#
-# base-files: #824594
-# base-passwd: debconf
-# bash: depends base-files
-# bsdutils: ok
-# coreutils: ok
-# dash: debconf
-# debianutils: ok
-# diffutils: ok
-# dpkg: ok
-# findutils: ok
-# grep: ok
-# gzip: ok
-# hostname: ok
-# init-system-helpers: ok
-# libc-bin: #983412
-# login: debconf
-# ncurses-base: ok
-# ncurses-bin: ok
-# perl-base: ok
-# sed: ok
-# sysvinit-utils: ok
-# tar: ok
-# util-linux: debconf
-
-set -eu
-export LC_ALL=C.UTF-8
-if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
-	if [ ! -e /mmdebstrap-testenv ]; then
-		echo "this test modifies the system and should only be run inside a container" >&2
-		exit 1
-	fi
-	adduser --gecos user --disabled-password user
-fi
-prefix=
-[ "$(id -u)" -eq 0 ] && prefix="runuser -u user --"
-$prefix {{ CMD }} --mode=chrootless --variant=custom --include=bsdutils,coreutils,debianutils,diffutils,dpkg,findutils,grep,gzip,hostname,init-system-helpers,ncurses-base,ncurses-bin,perl-base,sed,sysvinit-utils,tar {{ DIST }} /dev/null {{ MIRROR }}