[PATCH] t5570: add tests for "git fetch -v"

From

EWEric Wong <normalperson@yhbt.net>

Date

Feb 13, 2016, 00:35 UTC

Message-ID

<20160213003526.GA15899@dcvr.yhbt.net>

In-Reply-To

<CAPc5daUd6fQ6hX6W1AzQ9rCzrsTvkXOxZgwVdibbM5S34nF7ZA@mail.gmail.com>

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
  Junio C Hamano <gitster@pobox.com> wrote:
  > On Fri, Feb 12, 2016 at 3:49 PM, Eric Wong <normalperson@yhbt.net> wrote:
  > > Junio C Hamano <gitster@pobox.com> wrote:
  > >> * ew/connect-verbose (2016-01-28) 1 commit
  > >>   (merged to 'next' on 2016-02-03 at ceac37e)
  > >>  + pass transport verbosity down to git_connect
  > >
  > > Btw, I posted v2 of this with tests added to t/t5570-git-daemon.sh
  > >
  > >   http://mid.gmane.org/20160130085056.GA20118@dcvr.yhbt.net
  > >
  > > Can you replace it with my v2 or would you prefer a standalone
  > > patch for just the test?  Thanks.
  > 
  > Thanks, that's water under the bridge, so let's have a follow-up patch
  > to add test.

 t/t5570-git-daemon.sh | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index d76269a..095e862 100755
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -6,6 +6,13 @@ test_description='test fetching over git protocol'
 . "$TEST_DIRECTORY"/lib-git-daemon.sh
 start_git_daemon
 
+check_verbose_connect () {
+	grep -qF "Looking up 127.0.0.1 ..." stderr &&
+	grep -qF "Connecting to 127.0.0.1 (port " stderr &&
+	grep -qF "done." stderr &&
+	rm stderr
+}
+
 test_expect_success 'setup repository' '
 	git config push.default matching &&
 	echo content >file &&
@@ -24,18 +31,32 @@ test_expect_success 'create git-accessible bare repository' '
 '
 
 test_expect_success 'clone git repository' '
-	git clone "$GIT_DAEMON_URL/repo.git" clone &&
+	git clone -v "$GIT_DAEMON_URL/repo.git" clone 2>stderr &&
 	test_cmp file clone/file
 '
 
+test_expect_success 'clone -v stderr is as expected' check_verbose_connect
+
 test_expect_success 'fetch changes via git protocol' '
 	echo content >>file &&
 	git commit -a -m two &&
 	git push public &&
-	(cd clone && git pull) &&
+	(cd clone && git pull -v) 2>stderr &&
 	test_cmp file clone/file
 '
 
+test_expect_success 'pull -v stderr is as expected' check_verbose_connect
+
+test_expect_success 'no-op fetch -v stderr is as expected' '
+	(cd clone && git fetch -v) 2>stderr &&
+	check_verbose_connect
+'
+
+test_expect_success 'no-op fetch without "-v" is quiet' '
+	(cd clone && git fetch) 2>stderr &&
+	! test -s stderr
+'
+
 test_expect_success 'remote detects correct HEAD' '
 	git push public master:other &&
 	(cd clone &&

-- 
EW