1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
package identity
import (
"testing"
"github.com/stretchr/testify/require"
"github.com/MichaelMure/git-bug/repository"
)
func TestPushPull(t *testing.T) {
repoA, repoB, remote := repository.SetupReposAndRemote(t)
defer repository.CleanupTestRepos(t, repoA, repoB, remote)
identity1 := NewIdentity("name1", "email1")
err := identity1.Commit(repoA)
require.NoError(t, err)
// A --> remote --> B
_, err = Push(repoA, "origin")
require.NoError(t, err)
err = Pull(repoB, "origin")
require.NoError(t, err)
identities := allIdentities(t, ReadAllLocalIdentities(repoB))
if len(identities) != 1 {
t.Fatal("Unexpected number of bugs")
}
// B --> remote --> A
identity2 := NewIdentity("name2", "email2")
err = identity2.Commit(repoB)
require.NoError(t, err)
_, err = Push(repoB, "origin")
require.NoError(t, err)
err = Pull(repoA, "origin")
require.NoError(t, err)
identities = allIdentities(t, ReadAllLocalIdentities(repoA))
if len(identities) != 2 {
t.Fatal("Unexpected number of bugs")
}
// Update both
identity1.addVersionForTest(&Version{
name: "name1b",
email: "email1b",
})
err = identity1.Commit(repoA)
require.NoError(t, err)
identity2.addVersionForTest(&Version{
name: "name2b",
email: "email2b",
})
err = identity2.Commit(repoB)
require.NoError(t, err)
// A --> remote --> B
_, err = Push(repoA, "origin")
require.NoError(t, err)
err = Pull(repoB, "origin")
require.NoError(t, err)
identities = allIdentities(t, ReadAllLocalIdentities(repoB))
if len(identities) != 2 {
t.Fatal("Unexpected number of bugs")
}
// B --> remote --> A
_, err = Push(repoB, "origin")
require.NoError(t, err)
err = Pull(repoA, "origin")
require.NoError(t, err)
identities = allIdentities(t, ReadAllLocalIdentities(repoA))
if len(identities) != 2 {
t.Fatal("Unexpected number of bugs")
}
// Concurrent update
identity1.addVersionForTest(&Version{
name: "name1c",
email: "email1c",
})
err = identity1.Commit(repoA)
require.NoError(t, err)
identity1B, err := ReadLocal(repoB, identity1.Id())
require.NoError(t, err)
identity1B.addVersionForTest(&Version{
name: "name1concurrent",
email: "email1concurrent",
})
err = identity1B.Commit(repoB)
require.NoError(t, err)
// A --> remote --> B
_, err = Push(repoA, "origin")
require.NoError(t, err)
// Pulling a non-fast-forward update should fail
err = Pull(repoB, "origin")
require.Error(t, err)
identities = allIdentities(t, ReadAllLocalIdentities(repoB))
if len(identities) != 2 {
t.Fatal("Unexpected number of bugs")
}
// B --> remote --> A
// Pushing a non-fast-forward update should fail
_, err = Push(repoB, "origin")
require.Error(t, err)
err = Pull(repoA, "origin")
require.NoError(t, err)
identities = allIdentities(t, ReadAllLocalIdentities(repoA))
if len(identities) != 2 {
t.Fatal("Unexpected number of bugs")
}
}
func allIdentities(t testing.TB, identities <-chan StreamedIdentity) []*Identity {
var result []*Identity
for streamed := range identities {
if streamed.Err != nil {
t.Fatal(streamed.Err)
}
result = append(result, streamed.Identity)
}
return result
}
|
