From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Jan 2014 18:33:18 +0000 (-0800)
Subject: Merge branch 'jk/http-auth-tests-robustify'
X-Git-Tag: v1.9-rc0~26
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/35a116d740930f34e0d3cd2e07ed266e96a1d165?ds=inline;hp=-c

Merge branch 'jk/http-auth-tests-robustify'

Using the same username and password during the tests would not
catch a potential breakage of sending one when we should be sending
the other.

* jk/http-auth-tests-robustify:
use distinct username/password for http auth tests
---

35a116d740930f34e0d3cd2e07ed266e96a1d165
diff --combined t/lib-httpd.sh
index c4707843c4,d15fa0f045..bfdff2a8c9
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@@ -1,31 -1,4 +1,31 @@@
 -#!/bin/sh
 +# Shell library to run an HTTP server for use in tests.
 +# Ends the test early if httpd tests should not be run,
 +# for example because the user has not enabled them.
 +#
 +# Usage:
 +#
 +#	. ./test-lib.sh
 +#	. "$TEST_DIRECTORY"/lib-httpd.sh
 +#	start_httpd
 +#
 +#	test_expect_success '...' '
 +#		...
 +#	'
 +#
 +#	test_expect_success ...
 +#
 +#	stop_httpd
 +#	test_done
 +#
 +# Can be configured using the following variables.
 +#
 +#    GIT_TEST_HTTPD              enable HTTPD tests
 +#    LIB_HTTPD_PATH              web server path
 +#    LIB_HTTPD_MODULE_PATH       web server modules path
 +#    LIB_HTTPD_PORT              listening port
 +#    LIB_HTTPD_DAV               enable DAV
 +#    LIB_HTTPD_SVN               enable SVN
 +#    LIB_HTTPD_SSL               enable SSL
  #
  # Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
  #
@@@ -129,7 -102,7 +129,7 @@@ prepare_httpd() 
  	HTTPD_DEST=127.0.0.1:$LIB_HTTPD_PORT
  	HTTPD_URL=$HTTPD_PROTO://$HTTPD_DEST
  	HTTPD_URL_USER=$HTTPD_PROTO://user%40host@$HTTPD_DEST
- 	HTTPD_URL_USER_PASS=$HTTPD_PROTO://user%40host:user%40host@$HTTPD_DEST
+ 	HTTPD_URL_USER_PASS=$HTTPD_PROTO://user%40host:pass%40host@$HTTPD_DEST
  
  	if test -n "$LIB_HTTPD_DAV" -o -n "$LIB_HTTPD_SVN"
  	then
@@@ -217,7 -190,15 +217,15 @@@ setup_askpass_helper() 
  	test_expect_success 'setup askpass helper' '
  		write_script "$TRASH_DIRECTORY/askpass" <<-\EOF &&
  		echo >>"$TRASH_DIRECTORY/askpass-query" "askpass: $*" &&
- 		cat "$TRASH_DIRECTORY/askpass-response"
+ 		case "$*" in
+ 		*Username*)
+ 			what=user
+ 			;;
+ 		*Password*)
+ 			what=pass
+ 			;;
+ 		esac &&
+ 		cat "$TRASH_DIRECTORY/askpass-$what"
  		EOF
  		GIT_ASKPASS="$TRASH_DIRECTORY/askpass" &&
  		export GIT_ASKPASS &&
@@@ -227,7 -208,8 +235,8 @@@
  
  set_askpass() {
  	>"$TRASH_DIRECTORY/askpass-query" &&
- 	echo "$*" >"$TRASH_DIRECTORY/askpass-response"
+ 	echo "$1" >"$TRASH_DIRECTORY/askpass-user" &&
+ 	echo "$2" >"$TRASH_DIRECTORY/askpass-pass"
  }
  
  expect_askpass() {