From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: Lars Schneider <larsxschneider@gmail.com>,
Vitor Antunes <vitor.hda@gmail.com>,
Sam Hocevar <sam@hocevar.net>, Luke Diamand <luke@diamand.org>
Subject: [PATCH 1/2] git-p4 tests: cd to testdir before running python
Date: Sat, 23 Apr 2016 15:13:45 +0100 [thread overview]
Message-ID: <1461420826-4416-2-git-send-email-luke@diamand.org> (raw)
In-Reply-To: <1461420826-4416-1-git-send-email-luke@diamand.org>
The python one-liner for getting the current time prints out
error messages if the current directory is deleted while it is
running if using python3.
Avoid these messages by switching back to the test directory
before running python3, instead of remaining in the trash
directory.
Signed-off-by: Luke Diamand <luke@diamand.org>
---
t/lib-git-p4.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index f9ae1d7..77802fe 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -50,7 +50,7 @@ native_path() {
# at runtime (e.g. via NTP). The 'clock_gettime(CLOCK_MONOTONIC)'
# function could fix that but it is not in Python until 3.3.
time_in_seconds() {
- python -c 'import time; print int(time.time())'
+ (cd "$TEST_DIRECTORY" && python -c 'import time; print(int(time.time()))')
}
# Try to pick a unique port: guess a large number, then hope
--
2.8.1.218.gd2cea43.dirty
next prev parent reply other threads:[~2016-04-23 14:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-23 14:13 [PATCH 0/2] git-p4: support python3 in the tests Luke Diamand
2016-04-23 14:13 ` Luke Diamand [this message]
2016-04-23 14:13 ` [PATCH 2/2] git-p4 tests: work with python3 as well as python2 Luke Diamand
2016-04-25 22:07 ` [PATCH 0/2] git-p4: support python3 in the tests Junio C Hamano
2016-04-26 7:27 ` Luke Diamand
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461420826-4416-2-git-send-email-luke@diamand.org \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.com \
--cc=sam@hocevar.net \
--cc=vitor.hda@gmail.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.
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 NNTP newsgroup(s).