Merge branch 'master' into lukeshu/xbs

1 files changed, 46 insertions, 14 deletions

diff --git a/test/librechroot-test.sh b/test/librechroot-test.sh
index 5ca1b37..43f3143 100644
--- a/test/librechroot-test.sh
+++ b/test/librechroot-test.sh
@@ -4,30 +4,34 @@ describe librechroot
 
 . ./test-common.sh
 
+_setup_chrootdir
+
 before() {
 	_before librechroot
+
 	mkdir -p "$XDG_CONFIG_HOME"/libretools
-	echo "CHROOTDIR='$tmpdir/chrootdir'" > "$XDG_CONFIG_HOME"/libretools/chroot.conf
+
+	echo "CHROOTDIR='${chrootdir}'" > "$XDG_CONFIG_HOME"/libretools/chroot.conf
 	echo "CHROOT='default'" >> "$XDG_CONFIG_HOME"/libretools/chroot.conf
 	echo "CHROOTEXTRAPKG=()" >> "$XDG_CONFIG_HOME"/libretools/chroot.conf
 }
 
-after() {
+after() (
 	_after_sudo
-}
+)
 
 it_creates_repo_for_new_chroots() {
 	require network sudo || return 0
 	libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty
-	testsudo librechroot run test -r /repo/repo.db
+	testsudo librechroot -l "$roundup_test_name" run test -r /repo/repo.db
 }
 
 it_cleans_the_local_repo_correctly() {
 	require network sudo || return 0
 	libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty
-	testsudo librechroot make
-	testsudo librechroot clean-repo
-	testsudo librechroot run test -r /repo/repo.db
+	testsudo librechroot -l "$roundup_test_name" make
+	testsudo librechroot -l "$roundup_test_name" clean-repo
+	testsudo librechroot -l "$roundup_test_name" run test -r /repo/repo.db
 	# TODO: inspect /repo/* more
 }
 
@@ -36,10 +40,38 @@ it_respects_exit_status_if_out_isnt_a_tty() (
 	set -o pipefail
 	libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty
 	r=0
-	{ testsudo librechroot run exit 3 | cat; } || r=$?
+	{ testsudo librechroot -l "$roundup_test_name" run bash -c 'exit 3' | cat; } || r=$?
 	[[ $r == 3 ]]
 )
 
+it_creates_ca_certificates() {
+	require network sudo || return 0
+	libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty
+	testsudo librechroot -l "$roundup_test_name" run test -r /etc/ssl/certs/ca-certificates.crt
+}
+
+it_disables_networking_when_requested() {
+	require network sudo || return 0
+	libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty
+
+	    testsudo librechroot -l "$roundup_test_name"    run curl https://repo.parabolagnulinux.org/ >/dev/null
+	not testsudo librechroot -l "$roundup_test_name" -N run curl https://repo.parabolagnulinux.org/ >/dev/null
+}
+
+it_handles_CHROOTEXTRAPKG_correctly() {
+	requuire network sudo || return 0
+	libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty
+
+	not testsudo librechroot -l "$roundup_test_name" run lsof
+	echo "CHROOTEXTRAPKG=(lsof)" >> "$XDG_CONFIG_HOME"/libretools/chroot.conf
+	testsudo librechroot -l "$roundup_test_name" install-name lsof
+	testsudo librechroot -l "$roundup_test_name" clean-pkgs
+	testsudo librechroot -l "$roundup_test_name" run lsof
+	echo "CHROOTEXTRAPKG=()" >> "$XDG_CONFIG_HOME"/libretools/chroot.conf
+	testsudo librechroot -l "$roundup_test_name" clean-pkgs
+	not testsudo librechroot -l "$roundup_test_name" run lsof
+}
+
 it_displays_help_as_normal_user() {
 	rm -rf "$XDG_CONFIG_HOME"
 	LC_ALL=C librechroot help >$tmpdir/stdout 2>$tmpdir/stderr
@@ -49,19 +81,19 @@ it_displays_help_as_normal_user() {
 }
 
 it_otherwise_fails_as_normal_user() {
-	librechroot run true >$tmpdir/stdout 2>$tmpdir/stderr || stat=$?
+	librechroot -l "$roundup_test_name" run true >$tmpdir/stdout 2>$tmpdir/stderr || stat=$?
 
 	[[ $stat != 0 ]]
 	empty $tmpdir/stdout
-	! empty $tmpdir/stderr
+	not empty $tmpdir/stderr
 }
 
 it_displays_help_and_fails_with_0_args() {
-	LC_ALL=C librechroot >$tmpdir/stdout 2>$tmpdir/stderr || stat=$?
+	LC_ALL=C librechroot -l "$roundup_test_name" >$tmpdir/stdout 2>$tmpdir/stderr || stat=$?
 
 	[[ $stat != 0 ]]
 	empty $tmpdir/stdout
-	[[ "$(sed 1q $tmpdir/stderr)" =~ Usage:.* ]]
+	[[ "$(sed -n 2p $tmpdir/stderr)" =~ Usage:.* ]]
 }
 
 # requires sudo so we know it's not failing because it needs root
@@ -71,7 +103,7 @@ it_fails_for_unknown_commands() {
 
 	[[ $stat != 0 ]]
 	empty $tmpdir/stdout
-	! empty $tmpdir/stderr
+	not empty $tmpdir/stderr
 }
 
 # requires sudo so we know it's not failing because it needs root
@@ -81,5 +113,5 @@ it_fails_for_unknown_flags() {
 
 	[[ $stat != 0 ]]
 	empty $tmpdir/stdout
-	! empty $tmpdir/stderr
+	not empty $tmpdir/stderr
 }