diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-10-19 12:52:48 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-10-19 12:52:48 +0300 |
| commit | 04e13591236b5adbc962f083ad22b084934ed7da (patch) | |
| tree | d7ff9b2ed2cc92a4138da5de29e9b0a832dd8e98 | |
| parent | 6e813b1b03c89db750c17ab77afe84eba4d13339 (diff) | |
| parent | f94780ffd24f9e816bea5fe268ef00d35613cce8 (diff) | |
Merge branch 'zj-update-remote-test' into 'master'
Explicitly set user email before tagging in a test
See merge request gitlab-org/gitaly!930
| -rw-r--r-- | internal/service/remote/update_remote_mirror_test.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/internal/service/remote/update_remote_mirror_test.go b/internal/service/remote/update_remote_mirror_test.go index e382dc5e0..cd08bb08d 100644 --- a/internal/service/remote/update_remote_mirror_test.go +++ b/internal/service/remote/update_remote_mirror_test.go @@ -32,10 +32,14 @@ func TestSuccessfulUpdateRemoteMirrorRequest(t *testing.T) { testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "fetch", remoteName) // Updates - testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", "new-branch", "60ecb67744cb56576c30214ff52294f8ce2def98") // Add branch - testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", "ignored-branch", "60ecb67744cb56576c30214ff52294f8ce2def98") // Add branch not matching branch list - testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "update-ref", "refs/heads/empty-branch", "0b4bc9a49b562e85de7cc9e834518ea6828729b9") // Update branch - testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", "-D", "not-merged-branch") // Delete branch + testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", "new-branch", "60ecb67744cb56576c30214ff52294f8ce2def98") // Add branch + testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", "ignored-branch", "60ecb67744cb56576c30214ff52294f8ce2def98") // Add branch not matching branch list + testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "update-ref", "refs/heads/empty-branch", "0b4bc9a49b562e85de7cc9e834518ea6828729b9") // Update branch + testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", "-D", "not-merged-branch") // Delete branch + + // Scoped to the project, so will be removed after + testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "config", "user.email", "gitalytest@example.com") // Delete branch + testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "tag", "new-tag", "60ecb67744cb56576c30214ff52294f8ce2def98") // Add tag testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "tag", "-fam", "Overriding tag", "v1.0.0", "0b4bc9a49b562e85de7cc9e834518ea6828729b9") // Update tag testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "tag", "-d", "v0.0.1") // Delete tag |