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
|
# frozen_string_literal: true
require 'spec_helper'
describe Gitlab::Git::RepositoryMirroring do
class FakeRepository
include Gitlab::Git::RepositoryMirroring
def initialize(projects_stub)
@gitlab_projects = projects_stub
end
def gitlab_projects_error
raise Gitlab::Git::CommandError, @gitlab_projects.output
end
end
describe '#push_remote_branches' do
let(:projects_stub) { double.as_null_object }
let(:features) do
GitalyServer::FeatureFlags.new(
'gitaly-feature-ruby-push-mirror-retry' => 'true'
)
end
subject(:repository) { FakeRepository.new(projects_stub) }
context 'with a successful first push' do
it 'returns true' do
expect(projects_stub).to receive(:push_branches)
.with('remote_a', anything, true, %w[master], env: {})
.once
.and_return(true)
expect(projects_stub).not_to receive(:output)
expect(repository.push_remote_branches('remote_a', %w[master])).to eq(true)
end
end
context 'with a failed push and no retry' do
before do
allow(projects_stub).to receive(:features)
.and_return(double(enabled?: false))
end
it 'logs a list of branch results and raises CommandError' do
output = "Oh no, push mirroring failed!"
logger = spy
allow(projects_stub).to receive(:output).once.and_return(output)
allow(projects_stub).to receive(:logger).and_return(logger)
push_results = double(
accepted_branches: %w[develop],
rejected_branches: %w[master]
)
expect(Gitlab::Git::PushResults).to receive(:new)
.with(output)
.and_return(push_results)
# Cause an exception via gitlab_projects_error
expect(projects_stub).to receive(:push_branches).and_return(false)
# The CommandError gets re-raised, matching existing behavior
expect { repository.push_remote_branches('remote_a', %w[master develop]) }
.to raise_error(Gitlab::Git::CommandError, output)
# Ensure we logged a message with the PushResults info
expect(logger).to have_received(:info).with(%r{Accepted: develop / Rejected: master})
end
end
context 'with a failed first push and failed retry push' do
before do
allow(projects_stub).to receive(:features).and_return(features)
end
it 'raises a `CommandError`' do
# First push with two branches fails
expect(projects_stub).to receive(:push_branches)
.with('remote_a', anything, true, %w[master develop], env: {})
.once
.and_return(false)
# Only one branch was accepted
push_results = double(accepted_branches: %w[develop]).as_null_object
stub_const('Gitlab::Git::PushResults', push_results)
# Retry push also fails, but we tried!
expect(projects_stub).to receive(:push_branches)
.with('remote_a', anything, true, %w[develop], env: {})
.once
.and_return(false)
allow(projects_stub).to receive(:output).and_return('output')
expect { repository.push_remote_branches('remote_a', %w[master develop]) }
.to raise_error(Gitlab::Git::CommandError, 'output')
end
end
context 'with a failed first push and a successful retry push' do
it 'returns true' do
# First push with two branches fails
expect(projects_stub).to receive(:push_branches)
.with('remote_a', anything, true, %w[master develop], env: {})
.once
.and_return(false)
# Only one branch was accepted
push_results = double(accepted_branches: %w[develop]).as_null_object
stub_const('Gitlab::Git::PushResults', push_results)
# Retry push succeeds
expect(projects_stub).to receive(:push_branches)
.with('remote_a', anything, true, %w[develop], env: {})
.once
.and_return(true)
expect(projects_stub).to receive(:output).once.and_return('first_output')
expect(repository.push_remote_branches('remote_a', %w[master develop]))
.to eq(true)
end
end
end
end
|
