From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org, steadmon@google.com
Subject: Re: [PATCH 1/8] tests: define GIT_TEST_PROTOCOL_VERSION
Date: Wed, 06 Feb 2019 22:58:40 +0100 [thread overview]
Message-ID: <87d0o4lgtr.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <6e0c6aa9a71d4192591ed406735684cd15a0e3b9.1549411880.git.jonathantanmy@google.com>
On Wed, Feb 06 2019, Jonathan Tan wrote:
> Define a GIT_TEST_PROTOCOL_VERSION environment variable meant to be used
> from tests. When set, this ensures protocol.version is at least the
> given value, allowing the entire test suite to be run as if this
> configuration is in place for all repositories.
>
> As of this patch, all tests pass whether GIT_TEST_PROTOCOL_VERSION is
> unset, set to 0, or set to 1. Some tests fail when
> GIT_TEST_PROTOCOL_VERSION is set to 2, but this will be dealt with in
> subsequent patches.
>
> This is based on work by Ævar Arnfjörð Bjarmason.
>
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
> protocol.c | 17 +++++++++++++++--
> t/README | 3 +++
> t/t5400-send-pack.sh | 2 +-
> t/t5551-http-fetch-smart.sh | 3 ++-
> 4 files changed, 21 insertions(+), 4 deletions(-)
>
> diff --git a/protocol.c b/protocol.c
> index 5664bd7a05..c7a735bfa2 100644
> --- a/protocol.c
> +++ b/protocol.c
> @@ -42,6 +42,10 @@ static const char *format_protocol_version(enum protocol_version version)
> enum protocol_version get_protocol_version_config(void)
> {
> const char *value;
> + enum protocol_version retval = protocol_v0;
> + const char *git_test_k = "GIT_TEST_PROTOCOL_VERSION";
> + const char *git_test_v = getenv(git_test_k);
> +
> if (!git_config_get_string_const("protocol.version", &value)) {
> enum protocol_version version = parse_protocol_version(value);
>
> @@ -49,10 +53,19 @@ enum protocol_version get_protocol_version_config(void)
> die("unknown value for config 'protocol.version': %s",
> value);
>
> - return version;
> + retval = version;
> + }
> +
> + if (git_test_v && strlen(git_test_v)) {
> + enum protocol_version env = parse_protocol_version(git_test_v);
> +
> + if (env == protocol_unknown_version)
> + die("unknown value for %s: %s", git_test_k, git_test_v);
> + if (retval < env)
> + retval = env;
> }
>
> - return protocol_v0;
> + return retval;
> }
>
> void register_allowed_protocol_version(enum protocol_version version)
> diff --git a/t/README b/t/README
> index 25864ec883..21e941eb94 100644
> --- a/t/README
> +++ b/t/README
> @@ -327,6 +327,9 @@ marked strings" in po/README for details.
> GIT_TEST_SPLIT_INDEX=<boolean> forces split-index mode on the whole
> test suite. Accept any boolean values that are accepted by git-config.
>
> +GIT_TEST_PROTOCOL_VERSION=<n>, when set, overrides the
> +'protocol.version' setting to n if it is less than n.
> +
In my version
(https://public-inbox.org/git/20181213155817.27666-6-avarab@gmail.com/)
I didn't have this "if it is less than n" caveat. I expect that helped
with making some tests that were setting e.g. protocol.version=2 Just
Work, is that the reason for this?
Mine also had more docs here, but maybe telling people that they can use
"env" is too much...
> GIT_TEST_FULL_IN_PACK_ARRAY=<boolean> exercises the uncommon
> pack-objects code path where there are more than 1024 packs even if
> the actual number of packs in repository is below this limit. Accept
> diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
> index f1932ea431..571d620aed 100755
> --- a/t/t5400-send-pack.sh
> +++ b/t/t5400-send-pack.sh
> @@ -288,7 +288,7 @@ test_expect_success 'receive-pack de-dupes .have lines' '
> $shared .have
> EOF
>
> - GIT_TRACE_PACKET=$(pwd)/trace \
> + GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION= \
> git push \
> --receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \
> fork HEAD:foo &&
> diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
> index a60dd907bd..8f620e0a35 100755
> --- a/t/t5551-http-fetch-smart.sh
> +++ b/t/t5551-http-fetch-smart.sh
> @@ -44,7 +44,8 @@ test_expect_success 'clone http repository' '
> < Cache-Control: no-cache, max-age=0, must-revalidate
> < Content-Type: application/x-git-upload-pack-result
> EOF
> - GIT_TRACE_CURL=true git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
> + GIT_TRACE_CURL=true GIT_TEST_PROTOCOL_VERSION= \
> + git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
> test_cmp file clone/file &&
> tr '\''\015'\'' Q <err |
> sed -e "
next prev parent reply other threads:[~2019-02-06 21:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-06 0:21 [PATCH 0/8] Resend of GIT_TEST_PROTOCOL_VERSION patches Jonathan Tan
2019-02-06 0:21 ` [PATCH 1/8] tests: define GIT_TEST_PROTOCOL_VERSION Jonathan Tan
2019-02-06 21:58 ` Ævar Arnfjörð Bjarmason [this message]
2019-02-07 0:01 ` Jonathan Tan
2019-02-11 20:20 ` Jeff King
2019-02-06 0:21 ` [PATCH 2/8] tests: always test fetch of unreachable with v0 Jonathan Tan
2019-02-11 20:30 ` Jeff King
2019-02-14 19:58 ` Jonathan Tan
2019-02-21 13:49 ` Jeff King
2019-02-22 20:47 ` Junio C Hamano
2019-02-23 13:25 ` Jeff King
2019-02-06 0:21 ` [PATCH 3/8] t5503: fix overspecification of trace expectation Jonathan Tan
2019-02-06 0:21 ` [PATCH 4/8] t5512: compensate for v0 only sending HEAD symrefs Jonathan Tan
2019-02-06 0:21 ` [PATCH 5/8] t5700: only run with protocol version 1 Jonathan Tan
2019-02-06 0:21 ` [PATCH 6/8] tests: fix protocol version for overspecifications Jonathan Tan
2019-02-06 0:21 ` [PATCH 7/8] t5552: compensate for v2 filtering ref adv Jonathan Tan
2019-02-06 0:21 ` [PATCH 8/8] remote-curl: in v2, fill credentials if needed Jonathan Tan
2019-02-06 21:29 ` Jeff King
2019-02-11 19:20 ` Jonathan Tan
2019-02-11 20:38 ` Jeff King
2019-02-06 21:34 ` [PATCH 0/8] Resend of GIT_TEST_PROTOCOL_VERSION patches Jeff King
2019-02-06 21:52 ` Ævar Arnfjörð Bjarmason
2019-02-06 22:10 ` Jeff King
2019-02-06 22:20 ` Ævar Arnfjörð Bjarmason
2019-02-06 23:08 ` Jeff King
2019-02-07 10:49 ` Ævar Arnfjörð Bjarmason
-- strict thread matches above, loose matches on Subject: below --
2019-02-25 21:54 [PATCH 0/8] GIT_TEST_PROTOCOL_VERSION, this time on master Jonathan Tan
2019-02-25 21:54 ` [PATCH 1/8] tests: define GIT_TEST_PROTOCOL_VERSION Jonathan Tan
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d0o4lgtr.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=steadmon@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).