From 2a95c3d50c792532860f76b444f507f1d0331d5a Mon Sep 17 00:00:00 2001 From: Kevin Daudt Date: Mon, 11 Oct 2021 22:47:50 +0200 Subject: [PATCH] tests: only generate key when not available yet Installing a build key requires root permissions, something that is not possible in all cases, most notably on the builders. Instead of generating a key each time, which results in many keys being generated each test suite run, check whether a key is already present by using `abuild-sign --installed`, and only generate a key when that returns false. --- tests/abuild-sign.bats | 4 +++- tests/abuild.bats | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/abuild-sign.bats b/tests/abuild-sign.bats index 8ca4d6a..213aa35 100644 --- a/tests/abuild-sign.bats +++ b/tests/abuild-sign.bats @@ -12,7 +12,9 @@ setup() { export PATH="$PWD/../:$PATH" export ARCH=$(apk --print-arch) - abuild-keygen -ain >/dev/null 2>&1 + if ! abuild-sign --installed 2>/dev/null; then + abuild-keygen -ain >/dev/null 2>&1 + fi mkdir -p "$tmpdir" "$WORKDIR" } diff --git a/tests/abuild.bats b/tests/abuild.bats index a659246..8180e39 100644 --- a/tests/abuild.bats +++ b/tests/abuild.bats @@ -12,7 +12,9 @@ setup() { export APORTSDIR="$PWD"/testrepo export PATH="$PWD/../:$PATH" - abuild-keygen -ain >/dev/null 2>&1 + if ! abuild-sign --installed 2>/dev/null; then + abuild-keygen -ain >/dev/null 2>&1 + fi mkdir -p "$tmpdir" "$WORKDIR" printf "[color]\n\tui = always\n" > "$GIT_CONFIG_GLOBAL"