Add latest changes from gitlab-org/gitlab@master

1 files changed, 28 insertions, 48 deletions

diff --git a/spec/lib/gitlab/metrics/exporter/web_exporter_spec.rb b/spec/lib/gitlab/metrics/exporter/web_exporter_spec.rb
index 99349934e63..f22993cf057 100644
--- a/spec/lib/gitlab/metrics/exporter/web_exporter_spec.rb
+++ b/spec/lib/gitlab/metrics/exporter/web_exporter_spec.rb
@@ -4,61 +4,41 @@ require 'spec_helper'
 
 describe Gitlab::Metrics::Exporter::WebExporter do
   let(:exporter) { described_class.new }
-
-  context 'when blackout seconds is used' do
-    let(:blackout_seconds) { 0 }
-    let(:readiness_probe) { exporter.send(:readiness_probe).execute }
-
-    before do
-      stub_config(
-        monitoring: {
-          web_exporter: {
-            enabled: true,
-            port: 0,
-            address: '127.0.0.1',
-            blackout_seconds: blackout_seconds
-          }
+  let(:readiness_probe) { exporter.send(:readiness_probe).execute }
+
+  before do
+    stub_config(
+      monitoring: {
+        web_exporter: {
+          enabled: true,
+          port: 0,
+          address: '127.0.0.1'
         }
-      )
-
-      exporter.start
-    end
-
-    after do
-      exporter.stop
-    end
+      }
+    )
 
-    context 'when running server' do
-      it 'readiness probe returns succesful status' do
-        expect(readiness_probe.http_status).to eq(200)
-        expect(readiness_probe.json).to include(status: 'ok')
-        expect(readiness_probe.json).to include('web_exporter' => [{ 'status': 'ok' }])
-      end
-    end
-
-    context 'when blackout seconds is 10s' do
-      let(:blackout_seconds) { 10 }
+    exporter.start
+  end
 
-      it 'readiness probe returns a failure status' do
-        # during sleep we check the status of readiness probe
-        expect(exporter).to receive(:sleep).with(10) do
-          expect(readiness_probe.http_status).to eq(503)
-          expect(readiness_probe.json).to include(status: 'failed')
-          expect(readiness_probe.json).to include('web_exporter' => [{ 'status': 'failed' }])
-        end
+  after do
+    exporter.stop
+  end
 
-        exporter.stop
-      end
+  context 'when running server' do
+    it 'readiness probe returns succesful status' do
+      expect(readiness_probe.http_status).to eq(200)
+      expect(readiness_probe.json).to include(status: 'ok')
+      expect(readiness_probe.json).to include('web_exporter' => [{ 'status': 'ok' }])
     end
+  end
 
-    context 'when blackout is disabled' do
-      let(:blackout_seconds) { 0 }
-
-      it 'readiness probe returns a failure status' do
-        expect(exporter).not_to receive(:sleep)
+  describe '#mark_as_not_running!' do
+    it 'readiness probe returns a failure status' do
+      exporter.mark_as_not_running!
 
-        exporter.stop
-      end
+      expect(readiness_probe.http_status).to eq(503)
+      expect(readiness_probe.json).to include(status: 'failed')
+      expect(readiness_probe.json).to include('web_exporter' => [{ 'status': 'failed' }])
     end
   end
 end