topology tests: teach a helper to take abbreviated timestamps
The on_committer_date helper in t/lib-t6000 is used in t6002 and t6003 with timestamps on a single day within a single minute (i.e. 1971-08-16 00:00) and the tests repeat this over and over. The actual value of the timestamp, however, does not matter very much; only their relative ordering does. Introduce another helper to expand only the suffix of the timestamp to a full timestamp to make the lines shorter, and use it in this helper. Also, because all the commits in the test are made with specific GIT_COMMITTER_DATE, stop unsetting it at the end of the helper. We'll be specifying the author timestamp to these test commits in a later patch, which will be helped with this change. Also remove a test that was commented-out from t6003; it used to test a commit with the same parent listed twice, which was allowed by mistake but was fixed long time ago. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jun 21, 2013 at 10:29 UTC
841dc6935ea0f2ecfc778501edc66dc2c828d333
3 files changed
+81
-77
t/lib-t6000.sh
+13
-4
@@ -64,13 +64,22 @@ commit_date () {
64
sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
65
}
66
67
+# Assign the value of fake date to a variable, but
68
+# allow fairly common "1971-08-16 00:00" to be omittd
69
+assign_fake_date () {
70
+ case "$2" in
71
+ ??:??:??) eval "$1='1971-08-16 $2'" ;;
72
+ ??:??) eval "$1='1971-08-16 00:$2'" ;;
73
+ ??) eval "$1='1971-08-16 00:00:$2'" ;;
74
+ *) eval "$1='$2'" ;;
75
+ esac
76
+}
77
+
78
on_committer_date () {
68
- _date=$1
69
- shift 1
70
- GIT_COMMITTER_DATE="$_date"
79
+ assign_fake_date GIT_COMMITTER_DATE "$1"
80
export GIT_COMMITTER_DATE
81
+ shift 1
82
"$@"
73
- unset GIT_COMMITTER_DATE
83
}
84
85
# Execute a command and suppress any error output.
t/t6002-rev-list-bisect.sh
+42
-42
@@ -39,25 +39,25 @@ test_bisection_diff()
39
date >path0
40
git update-index --add path0
41
save_tag tree git write-tree
42
-on_committer_date "1971-08-16 00:00:00" hide_error save_tag root unique_commit root tree
43
-on_committer_date "1971-08-16 00:00:01" save_tag l0 unique_commit l0 tree -p root
44
-on_committer_date "1971-08-16 00:00:02" save_tag l1 unique_commit l1 tree -p l0
45
-on_committer_date "1971-08-16 00:00:03" save_tag l2 unique_commit l2 tree -p l1
46
-on_committer_date "1971-08-16 00:00:04" save_tag a0 unique_commit a0 tree -p l2
47
-on_committer_date "1971-08-16 00:00:05" save_tag a1 unique_commit a1 tree -p a0
48
-on_committer_date "1971-08-16 00:00:06" save_tag b1 unique_commit b1 tree -p a0
49
-on_committer_date "1971-08-16 00:00:07" save_tag c1 unique_commit c1 tree -p b1
50
-on_committer_date "1971-08-16 00:00:08" save_tag b2 unique_commit b2 tree -p b1
51
-on_committer_date "1971-08-16 00:00:09" save_tag b3 unique_commit b2 tree -p b2
52
-on_committer_date "1971-08-16 00:00:10" save_tag c2 unique_commit c2 tree -p c1 -p b2
53
-on_committer_date "1971-08-16 00:00:11" save_tag c3 unique_commit c3 tree -p c2
54
-on_committer_date "1971-08-16 00:00:12" save_tag a2 unique_commit a2 tree -p a1
55
-on_committer_date "1971-08-16 00:00:13" save_tag a3 unique_commit a3 tree -p a2
56
-on_committer_date "1971-08-16 00:00:14" save_tag b4 unique_commit b4 tree -p b3 -p a3
57
-on_committer_date "1971-08-16 00:00:15" save_tag a4 unique_commit a4 tree -p a3 -p b4 -p c3
58
-on_committer_date "1971-08-16 00:00:16" save_tag l3 unique_commit l3 tree -p a4
59
-on_committer_date "1971-08-16 00:00:17" save_tag l4 unique_commit l4 tree -p l3
60
-on_committer_date "1971-08-16 00:00:18" save_tag l5 unique_commit l5 tree -p l4
42
+on_committer_date "00:00" hide_error save_tag root unique_commit root tree
43
+on_committer_date "00:01" save_tag l0 unique_commit l0 tree -p root
44
+on_committer_date "00:02" save_tag l1 unique_commit l1 tree -p l0
45
+on_committer_date "00:03" save_tag l2 unique_commit l2 tree -p l1
46
+on_committer_date "00:04" save_tag a0 unique_commit a0 tree -p l2
47
+on_committer_date "00:05" save_tag a1 unique_commit a1 tree -p a0
48
+on_committer_date "00:06" save_tag b1 unique_commit b1 tree -p a0
49
+on_committer_date "00:07" save_tag c1 unique_commit c1 tree -p b1
50
+on_committer_date "00:08" save_tag b2 unique_commit b2 tree -p b1
51
+on_committer_date "00:09" save_tag b3 unique_commit b2 tree -p b2
52
+on_committer_date "00:10" save_tag c2 unique_commit c2 tree -p c1 -p b2
53
+on_committer_date "00:11" save_tag c3 unique_commit c3 tree -p c2
54
+on_committer_date "00:12" save_tag a2 unique_commit a2 tree -p a1
55
+on_committer_date "00:13" save_tag a3 unique_commit a3 tree -p a2
56
+on_committer_date "00:14" save_tag b4 unique_commit b4 tree -p b3 -p a3
57
+on_committer_date "00:15" save_tag a4 unique_commit a4 tree -p a3 -p b4 -p c3
58
+on_committer_date "00:16" save_tag l3 unique_commit l3 tree -p a4
59
+on_committer_date "00:17" save_tag l4 unique_commit l4 tree -p l3
60
+on_committer_date "00:18" save_tag l5 unique_commit l5 tree -p l4
61
git update-ref HEAD $(tag l5)
62
63
@@ -90,29 +90,29 @@ git update-ref HEAD $(tag l5)
90
# F
91
92
93
-on_committer_date "1971-08-16 00:00:00" hide_error save_tag F unique_commit F tree
94
-on_committer_date "1971-08-16 00:00:01" save_tag e8 unique_commit e8 tree -p F
95
-on_committer_date "1971-08-16 00:00:02" save_tag e7 unique_commit e7 tree -p e8
96
-on_committer_date "1971-08-16 00:00:03" save_tag e6 unique_commit e6 tree -p e7
97
-on_committer_date "1971-08-16 00:00:04" save_tag e5 unique_commit e5 tree -p e6
98
-on_committer_date "1971-08-16 00:00:05" save_tag f4 unique_commit f4 tree -p F
99
-on_committer_date "1971-08-16 00:00:06" save_tag f3 unique_commit f3 tree -p f4
100
-on_committer_date "1971-08-16 00:00:07" save_tag f2 unique_commit f2 tree -p f3
101
-on_committer_date "1971-08-16 00:00:08" save_tag f1 unique_commit f1 tree -p f2
102
-on_committer_date "1971-08-16 00:00:09" save_tag e4 unique_commit e4 tree -p e5
103
-on_committer_date "1971-08-16 00:00:10" save_tag e3 unique_commit e3 tree -p e4
104
-on_committer_date "1971-08-16 00:00:11" save_tag e2 unique_commit e2 tree -p e3
105
-on_committer_date "1971-08-16 00:00:12" save_tag e1 unique_commit e1 tree -p e2
106
-on_committer_date "1971-08-16 00:00:13" save_tag E unique_commit E tree -p e1 -p f1
107
-
108
-on_committer_date "1971-08-16 00:00:00" hide_error save_tag U unique_commit U tree
109
-on_committer_date "1971-08-16 00:00:01" save_tag u0 unique_commit u0 tree -p U
110
-on_committer_date "1971-08-16 00:00:01" save_tag u1 unique_commit u1 tree -p u0
111
-on_committer_date "1971-08-16 00:00:02" save_tag u2 unique_commit u2 tree -p u0
112
-on_committer_date "1971-08-16 00:00:03" save_tag u3 unique_commit u3 tree -p u0
113
-on_committer_date "1971-08-16 00:00:04" save_tag u4 unique_commit u4 tree -p u0
114
-on_committer_date "1971-08-16 00:00:05" save_tag u5 unique_commit u5 tree -p u0
115
-on_committer_date "1971-08-16 00:00:06" save_tag V unique_commit V tree -p u1 -p u2 -p u3 -p u4 -p u5
93
+on_committer_date "00:00" hide_error save_tag F unique_commit F tree
94
+on_committer_date "00:01" save_tag e8 unique_commit e8 tree -p F
95
+on_committer_date "00:02" save_tag e7 unique_commit e7 tree -p e8
96
+on_committer_date "00:03" save_tag e6 unique_commit e6 tree -p e7
97
+on_committer_date "00:04" save_tag e5 unique_commit e5 tree -p e6
98
+on_committer_date "00:05" save_tag f4 unique_commit f4 tree -p F
99
+on_committer_date "00:06" save_tag f3 unique_commit f3 tree -p f4
100
+on_committer_date "00:07" save_tag f2 unique_commit f2 tree -p f3
101
+on_committer_date "00:08" save_tag f1 unique_commit f1 tree -p f2
102
+on_committer_date "00:09" save_tag e4 unique_commit e4 tree -p e5
103
+on_committer_date "00:10" save_tag e3 unique_commit e3 tree -p e4
104
+on_committer_date "00:11" save_tag e2 unique_commit e2 tree -p e3
105
+on_committer_date "00:12" save_tag e1 unique_commit e1 tree -p e2
106
+on_committer_date "00:13" save_tag E unique_commit E tree -p e1 -p f1
107
+
108
+on_committer_date "00:00" hide_error save_tag U unique_commit U tree
109
+on_committer_date "00:01" save_tag u0 unique_commit u0 tree -p U
110
+on_committer_date "00:01" save_tag u1 unique_commit u1 tree -p u0
111
+on_committer_date "00:02" save_tag u2 unique_commit u2 tree -p u0
112
+on_committer_date "00:03" save_tag u3 unique_commit u3 tree -p u0
113
+on_committer_date "00:04" save_tag u4 unique_commit u4 tree -p u0
114
+on_committer_date "00:05" save_tag u5 unique_commit u5 tree -p u0
115
+on_committer_date "00:06" save_tag V unique_commit V tree -p u1 -p u2 -p u3 -p u4 -p u5
116
117
test_sequence()
118
{
t/t6003-rev-list-topo-order.sh
+26
-31
@@ -16,39 +16,34 @@ list_duplicates()
16
date >path0
17
git update-index --add path0
18
save_tag tree git write-tree
19
-on_committer_date "1971-08-16 00:00:00" hide_error save_tag root unique_commit root tree
20
-on_committer_date "1971-08-16 00:00:01" save_tag l0 unique_commit l0 tree -p root
21
-on_committer_date "1971-08-16 00:00:02" save_tag l1 unique_commit l1 tree -p l0
22
-on_committer_date "1971-08-16 00:00:03" save_tag l2 unique_commit l2 tree -p l1
23
-on_committer_date "1971-08-16 00:00:04" save_tag a0 unique_commit a0 tree -p l2
24
-on_committer_date "1971-08-16 00:00:05" save_tag a1 unique_commit a1 tree -p a0
25
-on_committer_date "1971-08-16 00:00:06" save_tag b1 unique_commit b1 tree -p a0
26
-on_committer_date "1971-08-16 00:00:07" save_tag c1 unique_commit c1 tree -p b1
27
-on_committer_date "1971-08-16 00:00:08" as_author foobar@example.com save_tag b2 unique_commit b2 tree -p b1
28
-on_committer_date "1971-08-16 00:00:09" save_tag b3 unique_commit b3 tree -p b2
29
-on_committer_date "1971-08-16 00:00:10" save_tag c2 unique_commit c2 tree -p c1 -p b2
30
-on_committer_date "1971-08-16 00:00:11" save_tag c3 unique_commit c3 tree -p c2
31
-on_committer_date "1971-08-16 00:00:12" save_tag a2 unique_commit a2 tree -p a1
32
-on_committer_date "1971-08-16 00:00:13" save_tag a3 unique_commit a3 tree -p a2
33
-on_committer_date "1971-08-16 00:00:14" save_tag b4 unique_commit b4 tree -p b3 -p a3
34
-on_committer_date "1971-08-16 00:00:15" save_tag a4 unique_commit a4 tree -p a3 -p b4 -p c3
35
-on_committer_date "1971-08-16 00:00:16" save_tag l3 unique_commit l3 tree -p a4
36
-on_committer_date "1971-08-16 00:00:17" save_tag l4 unique_commit l4 tree -p l3
37
-on_committer_date "1971-08-16 00:00:18" save_tag l5 unique_commit l5 tree -p l4
38
-on_committer_date "1971-08-16 00:00:19" save_tag m1 unique_commit m1 tree -p a4 -p c3
39
-on_committer_date "1971-08-16 00:00:20" save_tag m2 unique_commit m2 tree -p c3 -p a4
40
-on_committer_date "1971-08-16 00:00:21" hide_error save_tag alt_root unique_commit alt_root tree
41
-on_committer_date "1971-08-16 00:00:22" save_tag r0 unique_commit r0 tree -p alt_root
42
-on_committer_date "1971-08-16 00:00:23" save_tag r1 unique_commit r1 tree -p r0
43
-on_committer_date "1971-08-16 00:00:24" save_tag l5r1 unique_commit l5r1 tree -p l5 -p r1
44
-on_committer_date "1971-08-16 00:00:25" save_tag r1l5 unique_commit r1l5 tree -p r1 -p l5
19
+on_committer_date "00:00" hide_error save_tag root unique_commit root tree
20
+on_committer_date "00:01" save_tag l0 unique_commit l0 tree -p root
21
+on_committer_date "00:02" save_tag l1 unique_commit l1 tree -p l0
22
+on_committer_date "00:03" save_tag l2 unique_commit l2 tree -p l1
23
+on_committer_date "00:04" save_tag a0 unique_commit a0 tree -p l2
24
+on_committer_date "00:05" save_tag a1 unique_commit a1 tree -p a0
25
+on_committer_date "00:06" save_tag b1 unique_commit b1 tree -p a0
26
+on_committer_date "00:07" save_tag c1 unique_commit c1 tree -p b1
27
+on_committer_date "00:08" as_author foobar@example.com save_tag b2 unique_commit b2 tree -p b1
28
+on_committer_date "00:09" save_tag b3 unique_commit b3 tree -p b2
29
+on_committer_date "00:10" save_tag c2 unique_commit c2 tree -p c1 -p b2
30
+on_committer_date "00:11" save_tag c3 unique_commit c3 tree -p c2
31
+on_committer_date "00:12" save_tag a2 unique_commit a2 tree -p a1
32
+on_committer_date "00:13" save_tag a3 unique_commit a3 tree -p a2
33
+on_committer_date "00:14" save_tag b4 unique_commit b4 tree -p b3 -p a3
34
+on_committer_date "00:15" save_tag a4 unique_commit a4 tree -p a3 -p b4 -p c3
35
+on_committer_date "00:16" save_tag l3 unique_commit l3 tree -p a4
36
+on_committer_date "00:17" save_tag l4 unique_commit l4 tree -p l3
37
+on_committer_date "00:18" save_tag l5 unique_commit l5 tree -p l4
38
+on_committer_date "00:19" save_tag m1 unique_commit m1 tree -p a4 -p c3
39
+on_committer_date "00:20" save_tag m2 unique_commit m2 tree -p c3 -p a4
40
+on_committer_date "00:21" hide_error save_tag alt_root unique_commit alt_root tree
41
+on_committer_date "00:22" save_tag r0 unique_commit r0 tree -p alt_root
42
+on_committer_date "00:23" save_tag r1 unique_commit r1 tree -p r0
43
+on_committer_date "00:24" save_tag l5r1 unique_commit l5r1 tree -p l5 -p r1
44
+on_committer_date "00:25" save_tag r1l5 unique_commit r1l5 tree -p r1 -p l5
45
46
47
-#
48
-# note: as of 20/6, it isn't possible to create duplicate parents, so this
49
-# can't be tested.
50
-#
51
-#on_committer_date "1971-08-16 00:00:20" save_tag m3 unique_commit m3 tree -p c3 -p a4 -p c3
47
hide_error save_tag e1 as_author e@example.com unique_commit e1 tree
48
save_tag e2 as_author e@example.com unique_commit e2 tree -p e1
49
save_tag f1 as_author f@example.com unique_commit f1 tree -p e1