From 3691b66a31266b83b0b047ee955139cdb91f3ede Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 25 Feb 2017 13:31:45 +0100 Subject: tests: fix for recent changes --- tests/pwgen | 2 -- tests/setup.sh | 18 +++++++++++++++++- tests/t0010-generate-tests.sh | 2 +- tests/tr | 2 ++ 4 files changed, 20 insertions(+), 4 deletions(-) delete mode 100755 tests/pwgen create mode 100755 tests/tr diff --git a/tests/pwgen b/tests/pwgen deleted file mode 100755 index c83eec9..0000000 --- a/tests/pwgen +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -echo "${FAKE_PWGEN_PASSWORD:-Hello World}" diff --git a/tests/setup.sh b/tests/setup.sh index 779f14a..5d1e794 100644 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -7,7 +7,23 @@ # $TEST_HOME This folder -# We must be called from tests/ !! +# Unset config vars +unset PASSWORD_STORE_DIR +unset PASSWORD_STORE_KEY +unset PASSWORD_STORE_GIT +unset PASSWORD_STORE_GPG_OPTS +unset PASSWORD_STORE_X_SELECTION +unset PASSWORD_STORE_CLIP_TIME +unset PASSWORD_STORE_UMASK +unset PASSWORD_STORE_GENERATED_LENGTH +unset PASSWORD_STORE_CHARACTER_SET +unset PASSWORD_STORE_CHARACTER_SET_NO_SYMBOLS +unset PASSWORD_STORE_ENABLE_EXTENSIONS +unset PASSWORD_STORE_EXTENSIONS_DIR +unset PASSWORD_STORE_SIGNING_KEY +unset EDITOR + +# We must be called from tests/ TEST_HOME="$(pwd)" . ./sharness.sh diff --git a/tests/t0010-generate-tests.sh b/tests/t0010-generate-tests.sh index cadb76f..09f4099 100755 --- a/tests/t0010-generate-tests.sh +++ b/tests/t0010-generate-tests.sh @@ -12,7 +12,7 @@ test_expect_success 'Test "generate" command' ' test_expect_success 'Test replacement of first line' ' "$PASS" insert -m cred2 <<<"$(printf "this is a big\\npassword\\nwith\\nmany\\nlines\\nin it bla bla")" && - PATH="$TEST_HOME:$PATH" FAKE_PWGEN_PASSWORD="This is a fake password" "$PASS" generate -i cred2 88 && + PATH="$TEST_HOME:$PATH" FAKE_PWGEN_PASSWORD="This is a fake password" "$PASS" generate -i cred2 23 && [[ $("$PASS" show cred2) == "$(printf "This is a fake password\\npassword\\nwith\\nmany\\nlines\\nin it bla bla")" ]] ' diff --git a/tests/tr b/tests/tr new file mode 100755 index 0000000..c83eec9 --- /dev/null +++ b/tests/tr @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +echo "${FAKE_PWGEN_PASSWORD:-Hello World}" -- cgit v1.2.3