From: Junio C Hamano <gitster@pobox.com>
To: Devin Lehmacher <lehmacdj@gmail.com>, Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [GSoC][PATCH v4 4/4] credential-cache: add tests for XDG functionality
Date: Thu, 16 Mar 2017 09:29:58 -0700 [thread overview]
Message-ID: <xmqq8to5chh5.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170316051827.97198-5-lehmacdj@gmail.com> (Devin Lehmacher's message of "Thu, 16 Mar 2017 01:18:27 -0400")
Devin Lehmacher <lehmacdj@gmail.com> writes:
> @@ -20,4 +21,67 @@ helper_test_timeout cache --timeout=1
> # our socket, leaving us with no way to access the daemon.
> git credential-cache exit
>
> +# we need to use rm -rf here since sometimes the daemon hasn't finished
> +# cleaning up after itself and rmdir fails
Hmmmm. Peff, do you have ideas on better ways to do this (or
explanation why this is the best we could do)?
> +test_expect_success 'credential-cache --socket option overrides default location' '
> + test_when_finished "rm -rf \"$HOME\"/dir/" &&
> + check approve "cache --socket \"$HOME/dir/socket\"" <<-\EOF &&
> + protocol=https
> + host=example.com
> + username=store-user
> + password=store-pass
> + EOF
> + test -S "$HOME/dir/socket" &&
> + git credential-cache exit
> +'
> +
> +XDG_CACHE_HOME="$HOME/xdg"
> +export XDG_CACHE_HOME
> +# test behavior when XDG_CACHE_HOME is set
> +helper_test cache
> +
> +test_expect_success "use custom XDG_CACHE_HOME if set and default sockets are not created" '
> + test -S "$XDG_CACHE_HOME/git/credential/socket" &&
> + test_path_is_missing "$HOME/.git-credential-cache/socket" &&
> + test_path_is_missing "$HOME/.cache/git/credential/socket" &&
> + git credential-cache exit
> +'
> +unset XDG_CACHE_HOME
> +
> +test_expect_success "use custom XDG_CACHE_HOME even if xdg socket exists" '
> + check approve cache <<-\EOF &&
> + protocol=https
> + host=example.com
> + username=store-user
> + password=store-pass
> + EOF
> + test -S "$HOME/.cache/git/credential/socket" &&
> + XDG_CACHE_HOME="$HOME/xdg" &&
> + export XDG_CACHE_HOME &&
> + check approve cache <<-\EOF &&
> + protocol=https
> + host=example.com
> + username=store-user
> + password=store-pass
> + EOF
> + test -S "$HOME/xdg/git/credential/socket" &&
> + git credential-cache exit &&
> + unset XDG_CACHE_HOME
This unset will not run if any of the above steps since it was set
and exported fails. It probably should be in test_when_finished and
should use safe_unset shell function instead.
> +'
> +
> +# we need to use rm -rf here since sometimes the daemon hasn't finished
> +# cleaning up after itself and rmdir fails
> +test_expect_success 'use user socket if user directory exists' '
> + test_when_finished "rm -rf \"$HOME/.git-credential-cache/\"" &&
> + mkdir -p -m 700 "$HOME/.git-credential-cache/" &&
> + check approve cache <<-\EOF &&
> + protocol=https
> + host=example.com
> + username=store-user
> + password=store-pass
> + EOF
> + test -S "$HOME/.git-credential-cache/socket" &&
We should also test that the XDG location is not touched at the same
time that the traditional directory was used for the socket.
> + git credential-cache exit
> +'
This last test should be replicated to also check the case where we
have a symbolic link at ~/.git-credential-cache that points at a
directory.
> test_done
Thanks.
next prev parent reply other threads:[~2017-03-16 16:30 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-13 17:22 [GSoC][PATCH 0/3] Move ~/.git-credential-cache to ~/.cache/git Devin Lehmacher
2017-03-13 17:22 ` [GSoC][PATCH 1/3] path.c: Add xdg_cache_home to get paths under XDG_CACHE_HOME Devin Lehmacher
2017-03-13 18:48 ` Jeff King
2017-03-13 19:44 ` Devin Lehmacher
2017-03-13 17:22 ` [GSoC][PATCH 2/3] credential-cache.c: Make git use XDG_CACHE_HOME for credentials Devin Lehmacher
2017-03-13 18:09 ` Junio C Hamano
2017-03-13 19:03 ` Jeff King
2017-03-13 19:05 ` Junio C Hamano
2017-03-13 19:24 ` Devin Lehmacher
2017-03-13 19:22 ` Devin Lehmacher
2017-03-13 18:11 ` Junio C Hamano
2017-03-13 19:01 ` Jeff King
2017-03-13 17:22 ` [GSoC][PATCH 3/3] Update documentation to reflect new socket location Devin Lehmacher
2017-03-13 18:04 ` Junio C Hamano
2017-03-13 20:42 ` [GSoC][PATCH v2 2/2] credential-cache: use XDG_CACHE_HOME for socket Devin Lehmacher
2017-03-13 20:43 ` [GSoC][PATCH v2 1/2] path.c: add xdg_cache_home Devin Lehmacher
2017-03-13 20:43 ` [GSoC][PATCH v2 2/2] credential-cache: use XDG_CACHE_HOME for socket Devin Lehmacher
2017-03-13 21:52 ` Junio C Hamano
2017-03-14 0:32 ` [GSoC][PATCH/RFC v3 0/3] Fix commit messages, check if socket is socket Devin Lehmacher
2017-03-14 0:32 ` [GSoC][PATCH/RFC v3 1/3] path.c: add xdg_cache_home Devin Lehmacher
2017-03-14 0:32 ` [GSoC][PATCH/RFC v3 2/3] credential-cache: use XDG_CACHE_HOME for socket Devin Lehmacher
2017-03-14 1:50 ` Junio C Hamano
2017-03-14 0:32 ` [GSoC][PATCH/RFC v3 3/3] credential-cache: only use user_socket if a socket Devin Lehmacher
2017-03-14 0:40 ` Devin Lehmacher
2017-03-14 0:44 ` Brandon Williams
2017-03-14 1:30 ` Devin Lehmacher
2017-03-14 17:03 ` Brandon Williams
2017-03-14 1:52 ` Junio C Hamano
2017-03-14 6:10 ` Junio C Hamano
2017-03-14 6:17 ` Devin Lehmacher
2017-03-16 5:18 ` [GSoC][PATCH v4 0/4] Moving credential-cache socket to xdg path Devin Lehmacher
2017-03-16 5:18 ` [GSoC][PATCH v4 1/4] path.c: add xdg_cache_home Devin Lehmacher
2017-03-16 5:18 ` [GSoC][PATCH v4 2/4] dir: add directory_exists Devin Lehmacher
2017-03-16 16:09 ` Junio C Hamano
2017-03-16 18:26 ` Junio C Hamano
2017-03-16 5:18 ` [GSoC][PATCH v4 3/4] credential-cache: use XDG_CACHE_HOME for socket Devin Lehmacher
2017-03-16 16:20 ` Junio C Hamano
2017-03-16 18:02 ` Jeff King
2017-03-16 5:18 ` [GSoC][PATCH v4 4/4] credential-cache: add tests for XDG functionality Devin Lehmacher
2017-03-16 16:29 ` Junio C Hamano [this message]
2017-03-16 17:58 ` Jeff King
2017-03-17 2:53 ` [GSoC][PATCH v5 1/3] path.c: add xdg_cache_home Devin Lehmacher
2017-03-17 2:53 ` [GSoC][PATCH v5 2/3] credential-cache: use XDG_CACHE_HOME for socket Devin Lehmacher
2017-03-17 16:12 ` Ramsay Jones
2017-03-17 19:31 ` Devin Lehmacher
2017-03-17 2:53 ` [GSoC][PATCH v5 3/3] credential-cache: add tests for XDG functionality Devin Lehmacher
2017-03-17 5:38 ` Junio C Hamano
2017-03-17 12:36 ` [GSoC][PATCH v6 1/3] path.c: add xdg_cache_home Devin Lehmacher
2017-03-17 12:36 ` [GSoC][PATCH v6 2/3] credential-cache: use XDG_CACHE_HOME for socket Devin Lehmacher
2017-03-17 13:42 ` Jeff King
2017-03-17 12:36 ` [GSoC][PATCH v6 3/3] credential-cache: add tests for XDG functionality Devin Lehmacher
2017-03-17 13:38 ` Jeff King
2017-03-17 13:42 ` [GSoC][PATCH v6 1/3] path.c: add xdg_cache_home Jeff King
2017-03-13 21:39 ` [GSoC][PATCH v2 1/2] " Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2017-03-16 21:03 [GSoC][PATCH v4 4/4] credential-cache: add tests for XDG functionality Devin Lehmacher
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=xmqq8to5chh5.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=lehmacdj@gmail.com \
--cc=peff@peff.net \
/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).