git-p4: tests: use test-chmtime in place of touch
Using "touch" for P4EDITOR means that the tests can be a bit racy, since git-p4 checks the timestamp has been updated and fails if the timestamp is not updated. Use test-chmtime instead, which is designed for this. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Luke Diamand committed
May 19, 2015 at 23:23 UTC
f3b5b07c3c7a8494d78e975d689b6c4479e6b0f3
2 files changed
+7
-5
t/t9803-git-p4-shell-metachars.sh
+2
-2
@@ -28,7 +28,7 @@ test_expect_success 'shell metachars in filenames' '
28
echo f2 >"file with spaces" &&
29
git add "file with spaces" &&
30
git commit -m "add files" &&
31
- P4EDITOR=touch git p4 submit
31
+ P4EDITOR="test-chmtime +5" git p4 submit
32
) &&
33
(
34
cd "$cli" &&
@@ -47,7 +47,7 @@ test_expect_success 'deleting with shell metachars' '
47
git rm foo\$bar &&
48
git rm file\ with\ spaces &&
49
git commit -m "remove files" &&
50
- P4EDITOR=touch git p4 submit
50
+ P4EDITOR="test-chmtime +5" git p4 submit
51
) &&
52
(
53
cd "$cli" &&
t/t9813-git-p4-preserve-users.sh
+5
-3
@@ -53,7 +53,9 @@ test_expect_success 'preserve users' '
53
git commit --author "Alice <alice@example.com>" -m "a change by alice" file1 &&
54
git commit --author "Bob <bob@example.com>" -m "a change by bob" file2 &&
55
git config git-p4.skipSubmitEditCheck true &&
56
- P4EDITOR=touch P4USER=alice P4PASSWD=secret git p4 commit --preserve-user &&
56
+ P4EDITOR="test-chmtime +5" P4USER=alice P4PASSWD=secret &&
57
+ export P4EDITOR P4USER P4PASSWD &&
58
+ git p4 commit --preserve-user &&
59
p4_check_commit_author file1 alice &&
60
p4_check_commit_author file2 bob
61
)
@@ -69,7 +71,7 @@ test_expect_success 'refuse to preserve users without perms' '
71
git config git-p4.skipSubmitEditCheck true &&
72
echo "username-noperms: a change by alice" >>file1 &&
73
git commit --author "Alice <alice@example.com>" -m "perms: a change by alice" file1 &&
72
- P4EDITOR=touch P4USER=bob P4PASSWD=secret &&
74
+ P4EDITOR="test-chmtime +5" P4USER=bob P4PASSWD=secret &&
75
export P4EDITOR P4USER P4PASSWD &&
76
test_must_fail git p4 commit --preserve-user &&
77
! git diff --exit-code HEAD..p4/master
@@ -87,7 +89,7 @@ test_expect_success 'preserve user where author is unknown to p4' '
89
git commit --author "Bob <bob@example.com>" -m "preserve: a change by bob" file1 &&
90
echo "username-unknown: a change by charlie" >>file1 &&
91
git commit --author "Charlie <charlie@example.com>" -m "preserve: a change by charlie" file1 &&
90
- P4EDITOR=touch P4USER=alice P4PASSWD=secret &&
92
+ P4EDITOR="test-chmtime +5" P4USER=alice P4PASSWD=secret &&
93
export P4EDITOR P4USER P4PASSWD &&
94
test_must_fail git p4 commit --preserve-user &&
95
! git diff --exit-code HEAD..p4/master &&