From b8b344d1ba86c30c4fd452b40a3ae326634e8082 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 2 Oct 2018 13:47:44 -0400 Subject: Revert "test: librerelease: Begone with setup()" This reverts commit 70b9f3cdcabc217609be96cfdd1fd47133aa273b. --- test/cases/librerelease.bats | 11 +++++++++++ test/lib/common.bash | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/test/cases/librerelease.bats b/test/cases/librerelease.bats index 44a3893..eb73d35 100644 --- a/test/cases/librerelease.bats +++ b/test/cases/librerelease.bats @@ -1,5 +1,16 @@ load ../lib/common +setup() { + common_setup + + cat >> "$XDG_CONFIG_HOME/libretools/libretools.conf" <<-eot + REPODEST=ssh://repo@repo.parabola.nu:1863/~/staging/$LIBREUSER/staging/ + eot + cat >> "$XDG_CONFIG_HOME/pacman/makepkg.conf" <<-eot + PKGEXT=.pkg.tar.gz + eot +} + @test "librerelease displays usage text" { rm -rf "$XDG_CONFIG_HOME" LC_ALL=C librerelease -h >"$tmpdir/stdout" 2>"$tmpdir/stderr" diff --git a/test/lib/common.bash b/test/lib/common.bash index 12daee0..88aff4e 100644 --- a/test/lib/common.bash +++ b/test/lib/common.bash @@ -42,7 +42,6 @@ common_setup() { install -Dm644 /dev/stdin "$XDG_CONFIG_HOME"/libretools/libretools.conf <<-eot WORKDIR=${tmpdir@Q}/workdir BLACKLIST=https://git.parabola.nu/blacklist.git/plain/blacklist.txt - REPODEST=ssh://$LIBREUSER@localhost:1863/~/staging/$LIBREUSER/staging/ eot install -Dm644 /dev/stdin "$XDG_CONFIG_HOME"/libretools/chroot.conf <<-eot CHROOTDIR=${chrootdir@Q} -- cgit v1.2.2