From 6c7425b16895c6925c4f1ec875dac4576574b34c Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 1 Mar 2017 14:35:11 -0800 Subject: tests: fix on OSX by not using the tr hack --- tests/TODO.txt | 1 - tests/t0010-generate-tests.sh | 4 ++-- tests/tr | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) delete mode 100755 tests/tr (limited to 'tests') diff --git a/tests/TODO.txt b/tests/TODO.txt index 10c5d2b..3ec4577 100644 --- a/tests/TODO.txt +++ b/tests/TODO.txt @@ -2,7 +2,6 @@ * pass insert, pass ls * pass insert [with -e, with -m, without either] * pass insert, cp, mv, rm, generate [with -f, without -f, on existing] - * pass generate [with -n vs without -n] * git operations on all commands * Are empty folders pruned for rm, cp, mv, init (when "" is the argument) [with git, and without git] * Are git commits happening as planned? Are they being signed when signing is enabled? diff --git a/tests/t0010-generate-tests.sh b/tests/t0010-generate-tests.sh index 09f4099..4c7ada9 100755 --- a/tests/t0010-generate-tests.sh +++ b/tests/t0010-generate-tests.sh @@ -12,8 +12,8 @@ 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 23 && - [[ $("$PASS" show cred2) == "$(printf "This is a fake password\\npassword\\nwith\\nmany\\nlines\\nin it bla bla")" ]] + "$PASS" generate -i cred2 23 && + [[ $("$PASS" show cred2) == "$(printf "%s\\npassword\\nwith\\nmany\\nlines\\nin it bla bla" "$("$PASS" show cred2 | head -n 1)")" ]] ' test_done diff --git a/tests/tr b/tests/tr deleted file mode 100755 index c83eec9..0000000 --- a/tests/tr +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -echo "${FAKE_PWGEN_PASSWORD:-Hello World}" -- cgit v1.2.3