1 files changed, 113 insertions, 34 deletions
diff --git a/spec/lib/bitbucket_server/connection_spec.rb b/spec/lib/bitbucket_server/connection_spec.rb
index 8341ca10f43..59eda91285f 100644
--- a/spec/lib/bitbucket_server/connection_spec.rb
+++ b/spec/lib/bitbucket_server/connection_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe BitbucketServer::Connection do
+RSpec.describe BitbucketServer::Connection, feature_category: :importers do
   let(:options) { { base_uri: 'https://test:7990', user: 'bitbucket', password: 'mypassword' } }
   let(:payload) { { 'test' => 1 } }
   let(:headers) { { "Content-Type" => "application/json" } }
@@ -11,83 +11,162 @@ RSpec.describe BitbucketServer::Connection do
   subject { described_class.new(options) }
 
   describe '#get' do
-    it 'returns JSON body' do
-      WebMock.stub_request(:get, url).with(headers: { 'Accept' => 'application/json' }).to_return(body: payload.to_json, status: 200, headers: headers)
+    before do
+      WebMock.stub_request(:get, url).with(headers: { 'Accept' => 'application/json' })
+        .to_return(body: payload.to_json, status: 200, headers: headers)
+    end
+
+    it 'runs with retry_with_delay' do
+      expect(subject).to receive(:retry_with_delay).and_call_original.once
 
-      expect(subject.get(url, { something: 1 })).to eq(payload)
+      subject.get(url)
     end
 
-    it 'throws an exception if the response is not 200' do
-      WebMock.stub_request(:get, url).with(headers: { 'Accept' => 'application/json' }).to_return(body: payload.to_json, status: 500, headers: headers)
+    shared_examples 'handles get requests' do
+      it 'returns JSON body' do
+        expect(subject.get(url, { something: 1 })).to eq(payload)
+      end
+
+      it 'throws an exception if the response is not 200' do
+        WebMock.stub_request(:get, url).with(headers: { 'Accept' => 'application/json' }).to_return(body: payload.to_json, status: 500, headers: headers)
+
+        expect { subject.get(url) }.to raise_error(described_class::ConnectionError)
+      end
+
+      it 'throws an exception if the response is not JSON' do
+        WebMock.stub_request(:get, url).with(headers: { 'Accept' => 'application/json' }).to_return(body: 'bad data', status: 200, headers: headers)
 
-      expect { subject.get(url) }.to raise_error(described_class::ConnectionError)
+        expect { subject.get(url) }.to raise_error(described_class::ConnectionError)
+      end
+
+      it 'throws an exception upon a network error' do
+        WebMock.stub_request(:get, url).with(headers: { 'Accept' => 'application/json' }).to_raise(OpenSSL::SSL::SSLError)
+
+        expect { subject.get(url) }.to raise_error(described_class::ConnectionError)
+      end
     end
 
-    it 'throws an exception if the response is not JSON' do
-      WebMock.stub_request(:get, url).with(headers: { 'Accept' => 'application/json' }).to_return(body: 'bad data', status: 200, headers: headers)
+    it_behaves_like 'handles get requests'
+
+    context 'when the response is a 429 rate limit reached error' do
+      let(:response) do
+        instance_double(HTTParty::Response, parsed_response: payload, code: 429, headers: headers.merge('retry-after' => '0'))
+      end
+
+      before do
+        allow(Gitlab::HTTP).to receive(:get).and_return(response)
+      end
 
-      expect { subject.get(url) }.to raise_error(described_class::ConnectionError)
+      it 'sleeps, retries and if the error persists it fails' do
+        expect(Gitlab::BitbucketServerImport::Logger).to receive(:info)
+          .with(message: 'Retrying in 0 seconds due to 429 Too Many Requests')
+          .once
+
+        expect { subject.get(url) }.to raise_error(BitbucketServer::Connection::ConnectionError)
+      end
     end
 
-    it 'throws an exception upon a network error' do
-      WebMock.stub_request(:get, url).with(headers: { 'Accept' => 'application/json' }).to_raise(OpenSSL::SSL::SSLError)
+    context 'when the bitbucket_server_importer_exponential_backoff feature flag is disabled' do
+      before do
+        stub_feature_flags(bitbucket_server_importer_exponential_backoff: false)
+      end
 
-      expect { subject.get(url) }.to raise_error(described_class::ConnectionError)
+      it_behaves_like 'handles get requests'
     end
   end
 
   describe '#post' do
     let(:headers) { { 'Accept' => 'application/json', 'Content-Type' => 'application/json' } }
 
-    it 'returns JSON body' do
+    before do
       WebMock.stub_request(:post, url).with(headers: headers).to_return(body: payload.to_json, status: 200, headers: headers)
-
-      expect(subject.post(url, payload)).to eq(payload)
     end
 
-    it 'throws an exception if the response is not 200' do
-      WebMock.stub_request(:post, url).with(headers: headers).to_return(body: payload.to_json, status: 500, headers: headers)
+    it 'runs with retry_with_delay' do
+      expect(subject).to receive(:retry_with_delay).and_call_original.once
 
-      expect { subject.post(url, payload) }.to raise_error(described_class::ConnectionError)
+      subject.post(url, payload)
     end
 
-    it 'throws an exception upon a network error' do
-      WebMock.stub_request(:post, url).with(headers: { 'Accept' => 'application/json' }).to_raise(OpenSSL::SSL::SSLError)
+    shared_examples 'handles post requests' do
+      it 'returns JSON body' do
+        expect(subject.post(url, payload)).to eq(payload)
+      end
+
+      it 'throws an exception if the response is not 200' do
+        WebMock.stub_request(:post, url).with(headers: headers).to_return(body: payload.to_json, status: 500, headers: headers)
 
-      expect { subject.post(url, payload) }.to raise_error(described_class::ConnectionError)
+        expect { subject.post(url, payload) }.to raise_error(described_class::ConnectionError)
+      end
+
+      it 'throws an exception upon a network error' do
+        WebMock.stub_request(:post, url).with(headers: { 'Accept' => 'application/json' }).to_raise(OpenSSL::SSL::SSLError)
+
+        expect { subject.post(url, payload) }.to raise_error(described_class::ConnectionError)
+      end
+
+      it 'throws an exception if the URI is invalid' do
+        stub_request(:post, url).with(headers: { 'Accept' => 'application/json' }).to_raise(URI::InvalidURIError)
+
+        expect { subject.post(url, payload) }.to raise_error(described_class::ConnectionError)
+      end
     end
 
-    it 'throws an exception if the URI is invalid' do
-      stub_request(:post, url).with(headers: { 'Accept' => 'application/json' }).to_raise(URI::InvalidURIError)
+    it_behaves_like 'handles post requests'
 
-      expect { subject.post(url, payload) }.to raise_error(described_class::ConnectionError)
+    context 'when the bitbucket_server_importer_exponential_backoff feature flag is disabled' do
+      before do
+        stub_feature_flags(bitbucket_server_importer_exponential_backoff: false)
+      end
+
+      it_behaves_like 'handles post requests'
     end
   end
 
   describe '#delete' do
     let(:headers) { { 'Accept' => 'application/json', 'Content-Type' => 'application/json' } }
 
+    before do
+      WebMock.stub_request(:delete, branch_url).with(headers: headers).to_return(body: payload.to_json, status: 200, headers: headers)
+    end
+
     context 'branch API' do
       let(:branch_path) { '/projects/foo/repos/bar/branches' }
       let(:branch_url) { 'https://test:7990/rest/branch-utils/1.0/projects/foo/repos/bar/branches' }
       let(:path) {}
 
-      it 'returns JSON body' do
-        WebMock.stub_request(:delete, branch_url).with(headers: headers).to_return(body: payload.to_json, status: 200, headers: headers)
+      it 'runs with retry_with_delay' do
+        expect(subject).to receive(:retry_with_delay).and_call_original.once
 
-        expect(subject.delete(:branches, branch_path, payload)).to eq(payload)
+        subject.delete(:branches, branch_path, payload)
       end
 
-      it 'throws an exception if the response is not 200' do
-        WebMock.stub_request(:delete, branch_url).with(headers: headers).to_return(body: payload.to_json, status: 500, headers: headers)
+      shared_examples 'handles delete requests' do
+        it 'returns JSON body' do
+          expect(subject.delete(:branches, branch_path, payload)).to eq(payload)
+        end
 
-        expect { subject.delete(:branches, branch_path, payload) }.to raise_error(described_class::ConnectionError)
+        it 'throws an exception if the response is not 200' do
+          WebMock.stub_request(:delete, branch_url).with(headers: headers).to_return(body: payload.to_json, status: 500, headers: headers)
+
+          expect { subject.delete(:branches, branch_path, payload) }.to raise_error(described_class::ConnectionError)
+        end
+
+        it 'throws an exception upon a network error' do
+          WebMock.stub_request(:delete, branch_url).with(headers: headers).to_raise(OpenSSL::SSL::SSLError)
+
+          expect { subject.delete(:branches, branch_path, payload) }.to raise_error(described_class::ConnectionError)
+        end
       end
 
-      it 'throws an exception upon a network error' do
-        WebMock.stub_request(:delete, branch_url).with(headers: headers).to_raise(OpenSSL::SSL::SSLError)
+      it_behaves_like 'handles delete requests'
+
+      context 'with the bitbucket_server_importer_exponential_backoff feature flag disabled' do
+        before do
+          stub_feature_flags(bitbucket_server_importer_exponential_backoff: false)
+        end
 
-        expect { subject.delete(:branches, branch_path, payload) }.to raise_error(described_class::ConnectionError)
+        it_behaves_like 'handles delete requests'
       end
     end
   end