diff options
Diffstat (limited to 'bug/bug_actions_test.go')
| -rw-r--r-- | bug/bug_actions_test.go | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/bug/bug_actions_test.go b/bug/bug_actions_test.go index 345b5e9a..e35a7ece 100644 --- a/bug/bug_actions_test.go +++ b/bug/bug_actions_test.go @@ -20,6 +20,12 @@ func TestPushPull(t *testing.T) { err = bug1.Commit(repoA) require.NoError(t, err) + // distribute the identity + _, err = identity.Push(repoA, "origin") + require.NoError(t, err) + err = identity.Pull(repoB, "origin") + require.NoError(t, err) + // A --> remote --> B _, err = Push(repoA, "origin") require.NoError(t, err) @@ -87,7 +93,14 @@ func _RebaseTheirs(t testing.TB) { err = bug1.Commit(repoA) require.NoError(t, err) + // distribute the identity + _, err = identity.Push(repoA, "origin") + require.NoError(t, err) + err = identity.Pull(repoB, "origin") + require.NoError(t, err) + // A --> remote + _, err = Push(repoA, "origin") require.NoError(t, err) @@ -153,6 +166,12 @@ func _RebaseOurs(t testing.TB) { err = bug1.Commit(repoA) require.NoError(t, err) + // distribute the identity + _, err = identity.Push(repoA, "origin") + require.NoError(t, err) + err = identity.Pull(repoB, "origin") + require.NoError(t, err) + // A --> remote _, err = Push(repoA, "origin") require.NoError(t, err) @@ -236,6 +255,12 @@ func _RebaseConflict(t testing.TB) { err = bug1.Commit(repoA) require.NoError(t, err) + // distribute the identity + _, err = identity.Push(repoA, "origin") + require.NoError(t, err) + err = identity.Pull(repoB, "origin") + require.NoError(t, err) + // A --> remote _, err = Push(repoA, "origin") require.NoError(t, err) |