Skip to content

Commit

Permalink
t5570: use explicit push refspec
Browse files Browse the repository at this point in the history
The default mode for push without arguments will change. Some warnings
are about to be enabled for such use, which causes some t5570 tests to
fail because they do not expect this output.

Fix this by passing an explicit refspec to git push. To that end, change
the calling conventions of test_remote_error in order to accomodate
extra command arguments.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Clemens Buchacher authored and Junio C Hamano committed Apr 24, 2012
1 parent b55e677 commit aecff47
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions t/t5570-git-daemon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,12 @@ test_remote_error()
esac
done

if test $# -ne 3
then
error "invalid number of arguments"
fi

msg=$1
shift
cmd=$1
repo=$2
msg=$3
shift
repo=$1
shift || error "invalid number of arguments"

if test -x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/$repo"
then
Expand All @@ -122,7 +120,7 @@ test_remote_error()
fi
fi

test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" 2>output &&
test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" "$@" 2>output &&
echo "fatal: remote error: $msg: /$repo" >expect &&
test_cmp expect output
ret=$?
Expand All @@ -131,18 +129,18 @@ test_remote_error()
}

msg="access denied or repository not exported"
test_expect_success 'clone non-existent' "test_remote_error clone nowhere.git '$msg'"
test_expect_success 'push disabled' "test_remote_error push repo.git '$msg'"
test_expect_success 'read access denied' "test_remote_error -x fetch repo.git '$msg'"
test_expect_success 'not exported' "test_remote_error -n fetch repo.git '$msg'"
test_expect_success 'clone non-existent' "test_remote_error '$msg' clone nowhere.git "
test_expect_success 'push disabled' "test_remote_error '$msg' push repo.git master"
test_expect_success 'read access denied' "test_remote_error -x '$msg' fetch repo.git "
test_expect_success 'not exported' "test_remote_error -n '$msg' fetch repo.git "

stop_git_daemon
start_git_daemon --informative-errors

test_expect_success 'clone non-existent' "test_remote_error clone nowhere.git 'no such repository'"
test_expect_success 'push disabled' "test_remote_error push repo.git 'service not enabled'"
test_expect_success 'read access denied' "test_remote_error -x fetch repo.git 'no such repository'"
test_expect_success 'not exported' "test_remote_error -n fetch repo.git 'repository not exported'"
test_expect_success 'clone non-existent' "test_remote_error 'no such repository' clone nowhere.git "
test_expect_success 'push disabled' "test_remote_error 'service not enabled' push repo.git master"
test_expect_success 'read access denied' "test_remote_error -x 'no such repository' fetch repo.git "
test_expect_success 'not exported' "test_remote_error -n 'repository not exported' fetch repo.git "

stop_git_daemon
test_done

0 comments on commit aecff47

Please sign in to comment.