tests: fix for recent changes

3 files changed, 18 insertions, 2 deletions

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/pwgen b/tests/tr
index c83eec9..c83eec9 100755
--- a/tests/pwgen
+++ b/tests/tr