Commit Diff


commit - fc967f40a735d6677d3b5d3c68f08ff23f373f30
commit + 33fc334f899c8aea40a606e250bd06010d094c1b
blob - 2d847c25d775f95fe1aae56d8b6124dc1fd6d468
blob + 211abee4016cb282a508ce20789e5c5003547075
--- regress/cmdline/clone.sh
+++ regress/cmdline/clone.sh
@@ -867,11 +867,11 @@ test_clone_basic_http() {
 	local testurl=http://127.0.0.1:${GOT_TEST_HTTP_PORT}
 	local commit_id=`git_show_head $testroot/repo`
 
-	timeout 5 ./http-server -p $GOT_TEST_HTTP_PORT $testroot \
+	timeout 10 ./http-server -p $GOT_TEST_HTTP_PORT $testroot \
 	    > $testroot/http-server.log &
 	trap "kill %1" HUP INT QUIT PIPE TERM
 
-	sleep 1 # server starts up
+	sleep 2 # server starts up
 
 	# Test our custom HTTP server with git clone. Should succeed.
 	git clone -q $testurl/repo $testroot/repo-clone-with-git
blob - 989f4e6cf60ce8128c75220328753f473901b028
blob + 7d294c83563df52f1ef434b01d84c7b4103fdaf2
--- regress/cmdline/fetch.sh
+++ regress/cmdline/fetch.sh
@@ -2025,11 +2025,11 @@ test_fetch_basic_http() {
 	local testurl=http://127.0.0.1:$GOT_TEST_HTTP_PORT
 	local commit_id=`git_show_head $testroot/repo`
 
-	timeout 5 ./http-server -p $GOT_TEST_HTTP_PORT $testroot \
+	timeout 10 ./http-server -p $GOT_TEST_HTTP_PORT $testroot \
 	    > $testroot/http-server.log &
 	trap "kill %1" HUP INT QUIT PIPE TERM
 
-	sleep 1 # server starts up
+	sleep 2 # server starts up
 
 	got clone -q $testurl/repo $testroot/repo-clone
 	ret=$?
blob - 833f87bb85b0f4cf72b87af23b71df99419de359
blob + 390eafb4e6222216a2eaa674b9a94b79f2b12251
--- regress/cmdline/send.sh
+++ regress/cmdline/send.sh
@@ -1677,11 +1677,11 @@ test_send_basic_http() {
 	local testurl=http://127.0.0.1:$GOT_TEST_HTTP_PORT
 	local commit_id=`git_show_head $testroot/repo`
 
-	timeout 5 ./http-server -p $GOT_TEST_HTTP_PORT $testroot \
+	timeout 10 ./http-server -p $GOT_TEST_HTTP_PORT $testroot \
 	    > $testroot/http-server.log &
 	trap "kill %1" HUP INT QUIT PIPE TERM
 
-	sleep 1 # server starts up
+	sleep 2 # server starts up
 
 	got clone -q $testurl/repo $testroot/repo-clone
 	ret=$?