From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Thomas Rast <trast@student.ethz.ch>,
Brian Gernhardt <benji@silverinsanity.com>
Subject: [PATCH 3/5] t0300: make askpass tests a little more robust
Date: Wed, 14 Sep 2011 15:18:15 -0400 [thread overview]
Message-ID: <20110914191814.GC28267@sigill.intra.peff.net> (raw)
In-Reply-To: <20110914191704.GA23201@sigill.intra.peff.net>
Our fake askpass always just returned "askpass-result";
let's actually have it return a different fake value for
usernames and passwords, to be sure values are getting
routed correctly.
All tests should still pass.
Signed-off-by: Jeff King <peff@peff.net>
---
t/t0300-credentials.sh | 77 ++++++++++++++++++++++++-----------------------
1 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh
index 5d54976..09d5b15 100755
--- a/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@ -52,7 +52,8 @@ test_expect_success 'setup helper scripts' '
cat >askpass <<-\EOF &&
#!/bin/sh
echo >&2 askpass: $*
- echo askpass-result
+ what=`echo $1 | tr A-Z a-z | tr -cd a-z`
+ echo "askpass-$what"
EOF
chmod +x askpass &&
GIT_ASKPASS=askpass &&
@@ -155,8 +156,8 @@ test_expect_success 'do not bother completing already-full credential' '
# askpass helper is run, we know the internal getpass is working.
test_expect_success 'empty methods falls back to internal getpass' '
check <<-\EOF
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
@@ -166,7 +167,7 @@ test_expect_success 'empty methods falls back to internal getpass' '
test_expect_success 'internal getpass does not ask for known username' '
check --username=foo <<-\EOF
username=foo
- password=askpass-result
+ password=askpass-password
--
askpass: Password:
EOF
@@ -176,7 +177,7 @@ test_expect_success 'internal getpass can pull from config' '
git config credential.foo.username configured-username
check --unique=foo <<-\EOF
username=configured-username
- password=askpass-result
+ password=askpass-password
--
askpass: Password:
EOF
@@ -185,15 +186,15 @@ test_expect_success 'internal getpass can pull from config' '
test_expect_success 'credential-cache caches password' '
test_when_finished "git credential-cache --exit" &&
check --unique=host cache <<-\EOF &&
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
EOF
check --unique=host cache <<-\EOF
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
EOF
'
@@ -201,15 +202,15 @@ test_expect_success 'credential-cache caches password' '
test_expect_success 'credential-cache requires matching unique token' '
test_when_finished "git credential-cache --exit" &&
check --unique=host cache <<-\EOF &&
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
EOF
check --unique=host2 cache <<-\EOF
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
@@ -219,15 +220,15 @@ test_expect_success 'credential-cache requires matching unique token' '
test_expect_success 'credential-cache requires matching usernames' '
test_when_finished "git credential-cache --exit" &&
check --unique=host cache <<-\EOF &&
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
EOF
check --unique=host --username=other cache <<-\EOF
username=other
- password=askpass-result
+ password=askpass-password
--
askpass: Password:
EOF
@@ -236,16 +237,16 @@ test_expect_success 'credential-cache requires matching usernames' '
test_expect_success 'credential-cache times out' '
test_when_finished "git credential-cache --exit || true" &&
check --unique=host "cache --timeout=1" <<-\EOF &&
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
EOF
sleep 2 &&
check --unique=host cache <<-\EOF
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
@@ -255,18 +256,18 @@ test_expect_success 'credential-cache times out' '
test_expect_success 'credential-cache removes rejected credentials' '
test_when_finished "git credential-cache --exit || true" &&
check --unique=host cache <<-\EOF &&
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
EOF
- check --reject --unique=host --username=askpass-result cache <<-\EOF &&
+ check --reject --unique=host --username=askpass-username cache <<-\EOF &&
--
EOF
check --unique=host cache <<-\EOF
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
@@ -276,15 +277,15 @@ test_expect_success 'credential-cache removes rejected credentials' '
test_expect_success 'credential-store stores password' '
test_when_finished "rm -f .git-credentials" &&
check --unique=host store <<-\EOF &&
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
EOF
check --unique=host store <<-\EOF
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
EOF
'
@@ -292,15 +293,15 @@ test_expect_success 'credential-store stores password' '
test_expect_success 'credential-store requires matching unique token' '
test_when_finished "rm -f .git-credentials" &&
check --unique=host store <<-\EOF &&
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
EOF
check --unique=host2 store <<-\EOF
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
@@ -310,18 +311,18 @@ test_expect_success 'credential-store requires matching unique token' '
test_expect_success 'credential-store removes rejected credentials' '
test_when_finished "rm -f .git-credentials" &&
check --unique=host store <<-\EOF &&
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
EOF
- check --reject --unique=host --username=askpass-result store <<-\EOF &&
+ check --reject --unique=host --username=askpass-username store <<-\EOF &&
--
EOF
check --unique=host store <<-\EOF
- username=askpass-result
- password=askpass-result
+ username=askpass-username
+ password=askpass-password
--
askpass: Username:
askpass: Password:
--
1.7.6.252.ge9c18
next prev parent reply other threads:[~2011-09-14 19:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-14 19:17 [PATCH 0/5] credential helper super fun pak Jeff King
2011-09-14 19:17 ` [PATCH 1/5] docs: minor tweaks to credentials API Jeff King
2011-09-14 19:17 ` [PATCH 2/5] credential-cache: fix expiration calculation corner cases Jeff King
2011-09-15 8:37 ` Thomas Rast
2011-09-16 11:51 ` [PATCH 1/2] t0300: add missing EOF terminator for << Thomas Rast
2011-09-16 11:51 ` [PATCH 2/2] check_expirations: don't copy over same element Thomas Rast
2011-09-16 15:47 ` Jeff King
2011-09-18 21:51 ` [PATCH 2/5] credential-cache: fix expiration calculation corner cases Junio C Hamano
2011-09-14 19:18 ` Jeff King [this message]
2011-09-14 19:18 ` [PATCH 4/5] t0300: make alternate username tests more robust Jeff King
2011-09-14 19:21 ` [PATCH 5/5] credential-store: use a better storage format Jeff King
2011-09-14 21:37 ` [PATCH 0/5] credential helper super fun pak Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110914191814.GC28267@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=benji@silverinsanity.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@student.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).