summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-10-02 13:47:44 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-10-02 23:25:39 -0400
commitb8b344d1ba86c30c4fd452b40a3ae326634e8082 (patch)
tree6b3c8be36de8f19b26e078dfbe2a24f384444f0b
parent41b5926f5c69eb4be7450413377422f98c5db6f2 (diff)
Revert "test: librerelease: Begone with setup()"
This reverts commit 70b9f3cdcabc217609be96cfdd1fd47133aa273b.
-rw-r--r--test/cases/librerelease.bats11
-rw-r--r--test/lib/common.bash1
2 files changed, 11 insertions, 1 deletions
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}