remote-testgit: cleanup tests
We don't need a bare 'server' and an intermediary 'public'. The repos can talk to each other directly; that's what we want to exercise. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Nov 28, 2012 at 23:11 UTC
3808b8515bc777f63348c3f4053314742c59ac51
1 file changed
+29
-34
t/t5801-remote-helpers.sh
+29
-34
@@ -19,100 +19,95 @@ compare_refs() {
19
}
20
21
test_expect_success 'setup repository' '
22
- git init --bare server/.git &&
23
- git clone server public &&
24
- (cd public &&
22
+ git init server &&
23
+ (cd server &&
24
echo content >file &&
25
git add file &&
27
- git commit -m one &&
28
- git push origin master)
26
+ git commit -m one)
27
'
28
29
test_expect_success 'cloning from local repo' '
32
- git clone "testgit::${PWD}/server" localclone &&
33
- test_cmp public/file localclone/file
30
+ git clone "testgit::${PWD}/server" local &&
31
+ test_cmp server/file local/file
32
'
33
34
test_expect_success 'create new commit on remote' '
37
- (cd public &&
35
+ (cd server &&
36
echo content >>file &&
39
- git commit -a -m two &&
40
- git push)
37
+ git commit -a -m two)
38
'
39
40
test_expect_success 'pulling from local repo' '
44
- (cd localclone && git pull) &&
45
- test_cmp public/file localclone/file
41
+ (cd local && git pull) &&
42
+ test_cmp server/file local/file
43
'
44
45
test_expect_success 'pushing to local repo' '
49
- (cd localclone &&
46
+ (cd local &&
47
echo content >>file &&
48
git commit -a -m three &&
49
git push) &&
53
- compare_refs localclone HEAD server HEAD
50
+ compare_refs local HEAD server HEAD
51
'
52
53
test_expect_success 'fetch new branch' '
57
- (cd public &&
54
+ (cd server &&
55
+ git reset --hard &&
56
git checkout -b new &&
57
echo content >>file &&
60
- git commit -a -m five &&
61
- git push origin new
58
+ git commit -a -m five
59
) &&
63
- (cd localclone &&
60
+ (cd local &&
61
git fetch origin new
62
) &&
66
- compare_refs public HEAD localclone FETCH_HEAD
63
+ compare_refs server HEAD local FETCH_HEAD
64
'
65
66
#
67
# This is only needed because of a bug not detected by this script. It will be
68
# fixed shortly, but for now lets not cause regressions.
69
#
73
-test_expect_success 'bump commit in public' '
74
- (cd public &&
70
+test_expect_success 'bump commit in server' '
71
+ (cd server &&
72
git checkout master &&
76
- git pull &&
73
echo content >>file &&
78
- git commit -a -m four &&
79
- git push) &&
80
- compare_refs public HEAD server HEAD
74
+ git commit -a -m four) &&
75
+ compare_refs server HEAD server HEAD
76
'
77
78
test_expect_success 'fetch multiple branches' '
84
- (cd localclone &&
79
+ (cd local &&
80
git fetch
81
) &&
87
- compare_refs server master localclone refs/remotes/origin/master &&
88
- compare_refs server new localclone refs/remotes/origin/new
82
+ compare_refs server master local refs/remotes/origin/master &&
83
+ compare_refs server new local refs/remotes/origin/new
84
'
85
86
test_expect_success 'push when remote has extra refs' '
92
- (cd localclone &&
87
+ (cd local &&
88
git reset --hard origin/master &&
89
echo content >>file &&
90
git commit -a -m six &&
91
git push
92
) &&
98
- compare_refs localclone master server master
93
+ compare_refs local master server master
94
'
95
96
test_expect_success 'push new branch by name' '
102
- (cd localclone &&
97
+ (cd local &&
98
git checkout -b new-name &&
99
echo content >>file &&
100
git commit -a -m seven &&
101
git push origin new-name
102
) &&
108
- compare_refs localclone HEAD server refs/heads/new-name
103
+ compare_refs local HEAD server refs/heads/new-name
104
'
105
106
test_expect_failure 'push new branch with old:new refspec' '
112
- (cd localclone &&
107
+ (cd local &&
108
git push origin new-name:new-refspec
109
) &&
115
- compare_refs localclone HEAD server refs/heads/new-refspec
110
+ compare_refs local HEAD server refs/heads/new-refspec
111
'
112
113
test_done