Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

5 files changed, 135 insertions, 118 deletions

diff --git a/qa/spec/support/formatters/test_stats_formatter_spec.rb b/qa/spec/support/formatters/test_stats_formatter_spec.rb
index 859d45a660b..f9baf9bd9d9 100644
--- a/qa/spec/support/formatters/test_stats_formatter_spec.rb
+++ b/qa/spec/support/formatters/test_stats_formatter_spec.rb
@@ -20,6 +20,8 @@ describe QA::Support::Formatters::TestStatsFormatter do
   let(:influx_write_api) { instance_double('InfluxDB2::WriteApi', write: nil) }
   let(:stage) { '1_manage' }
   let(:file_path) { "./qa/specs/features/#{stage}/subfolder/some_spec.rb" }
+  let(:ui_fabrication) { 0 }
+  let(:api_fabrication) { 0 }
 
   let(:influx_client_args) do
     {
@@ -48,6 +50,9 @@ describe QA::Support::Formatters::TestStatsFormatter do
       fields: {
         id: './spec/support/formatters/test_stats_formatter_spec.rb[1:1]',
         run_time: 0,
+        api_fabrication: api_fabrication * 1000,
+        ui_fabrication: ui_fabrication * 1000,
+        total_fabrication: (api_fabrication + ui_fabrication) * 1000,
         retry_attempts: 0,
         job_url: ci_job_url,
         pipeline_url: ci_pipeline_url,
@@ -69,6 +74,11 @@ describe QA::Support::Formatters::TestStatsFormatter do
     RSpec::Core::Sandbox.sandboxed do |config|
       config.formatter = QA::Support::Formatters::TestStatsFormatter
 
+      config.append_after do |example|
+        example.metadata[:api_fabrication] = Thread.current[:api_fabrication]
+        example.metadata[:browser_ui_fabrication] = Thread.current[:browser_ui_fabrication]
+      end
+
       config.before(:context) { RSpec.current_example = nil }
 
       example.run
@@ -171,5 +181,21 @@ describe QA::Support::Formatters::TestStatsFormatter do
         expect(influx_write_api).to have_received(:write).with(data: [data])
       end
     end
+
+    context 'with fabrication runtimes' do
+      let(:ui_fabrication) { 10 }
+      let(:api_fabrication) { 4 }
+
+      before do
+        Thread.current[:api_fabrication] = api_fabrication
+        Thread.current[:browser_ui_fabrication] = ui_fabrication
+      end
+
+      it 'exports data to influxdb with fabrication times' do
+        run_spec
+
+        expect(influx_write_api).to have_received(:write).with(data: [data])
+      end
+    end
   end
 end
diff --git a/qa/spec/support/repeater_spec.rb b/qa/spec/support/repeater_spec.rb
index da8d6b18fb0..4fa3bcde5e7 100644
--- a/qa/spec/support/repeater_spec.rb
+++ b/qa/spec/support/repeater_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe QA::Support::Repeater do
       context 'when retry_on_exception is not provided (default: false)' do
         context 'when max_duration is provided' do
           context 'when max duration is reached' do
-            it 'raises an exception' do
+            it 'raises an exception with default message' do
               expect do
                 Timecop.freeze do
                   subject.repeat_until(max_duration: 1) do
@@ -31,7 +31,20 @@ RSpec.describe QA::Support::Repeater do
                     false
                   end
                 end
-              end.to raise_error(QA::Support::Repeater::WaitExceededError, "Wait condition not met after 1 second")
+              end.to raise_error(QA::Support::Repeater::WaitExceededError, "Wait failed after 1 second")
+            end
+
+            it 'raises an exception with custom message' do
+              message = 'Some custom action'
+
+              expect do
+                Timecop.freeze do
+                  subject.repeat_until(max_duration: 1, message: message) do
+                    Timecop.travel(2)
+                    false
+                  end
+                end
+              end.to raise_error(QA::Support::Repeater::WaitExceededError, "#{message} failed after 1 second")
             end
 
             it 'ignores attempts' do
@@ -70,14 +83,26 @@ RSpec.describe QA::Support::Repeater do
 
         context 'when max_attempts is provided' do
           context 'when max_attempts is reached' do
-            it 'raises an exception' do
+            it 'raises an exception with default message' do
               expect do
                 Timecop.freeze do
                   subject.repeat_until(max_attempts: 1) do
                     false
                   end
                 end
-              end.to raise_error(QA::Support::Repeater::RetriesExceededError, "Retry condition not met after 1 attempt")
+              end.to raise_error(QA::Support::Repeater::RetriesExceededError, "Retry failed after 1 attempt")
+            end
+
+            it 'raises an exception with custom message' do
+              message = 'Some custom action'
+
+              expect do
+                Timecop.freeze do
+                  subject.repeat_until(max_attempts: 1, message: message) do
+                    false
+                  end
+                end
+              end.to raise_error(QA::Support::Repeater::RetriesExceededError, "#{message} failed after 1 attempt")
             end
 
             it 'ignores duration' do
@@ -126,7 +151,7 @@ RSpec.describe QA::Support::Repeater do
                     false
                   end
                 end
-              end.to raise_error(QA::Support::Repeater::RetriesExceededError, "Retry condition not met after 1 attempt")
+              end.to raise_error(QA::Support::Repeater::RetriesExceededError, "Retry failed after 1 attempt")
             end
           end
 
@@ -141,7 +166,7 @@ RSpec.describe QA::Support::Repeater do
                     false
                   end
                 end
-              end.to raise_error(QA::Support::Repeater::WaitExceededError, "Wait condition not met after 1 second")
+              end.to raise_error(QA::Support::Repeater::WaitExceededError, "Wait failed after 1 second")
             end
           end
         end
@@ -210,7 +235,7 @@ RSpec.describe QA::Support::Repeater do
                     false
                   end
                 end
-              end.to raise_error(QA::Support::Repeater::RetriesExceededError, "Retry condition not met after 1 attempt")
+              end.to raise_error(QA::Support::Repeater::RetriesExceededError, "Retry failed after 1 attempt")
             end
           end
 
@@ -225,7 +250,7 @@ RSpec.describe QA::Support::Repeater do
                     false
                   end
                 end
-              end.to raise_error(QA::Support::Repeater::WaitExceededError, "Wait condition not met after 1 second")
+              end.to raise_error(QA::Support::Repeater::WaitExceededError, "Wait failed after 1 second")
             end
           end
         end
@@ -380,34 +405,67 @@ RSpec.describe QA::Support::Repeater do
       end
     end
 
-    it 'logs attempts' do
-      attempted = false
+    context 'with logging' do
+      before do
+        allow(QA::Runtime::Logger).to receive(:debug)
+      end
 
-      expect do
-        subject.repeat_until(max_attempts: 1) do
-          unless attempted
-            attempted = true
-            break false
-          end
+      it 'skips logging single attempt with max_attempts' do
+        subject.repeat_until(max_attempts: 3) do
+          true
+        end
 
+        expect(QA::Runtime::Logger).not_to have_received(:debug)
+      end
+
+      it 'skips logging single attempt with max_duration' do
+        subject.repeat_until(max_duration: 3) do
           true
         end
-      end.to output(/Attempt number/).to_stdout_from_any_process
-    end
 
-    it 'allows logging to be silenced' do
-      attempted = false
+        expect(QA::Runtime::Logger).not_to have_received(:debug)
+      end
 
-      expect do
-        subject.repeat_until(max_attempts: 1, log: false) do
-          unless attempted
-            attempted = true
-            break false
-          end
+      it 'allows logging to be silenced' do
+        subject.repeat_until(max_attempts: 3, log: false, raise_on_failure: false) do
+          false
+        end
 
-          true
+        expect(QA::Runtime::Logger).not_to have_received(:debug)
+      end
+
+      it 'starts logging on subsequent attempts for max_duration' do
+        subject.repeat_until(max_duration: 0.3, sleep_interval: 0.1, raise_on_failure: false) do
+          false
+        end
+
+        aggregate_failures do
+          expect(QA::Runtime::Logger).to have_received(:debug).with(<<~MSG.strip).ordered.once
+            Retrying action with: max_duration: 0.3; sleep_interval: 0.1; raise_on_failure: false; retry_on_exception: false
+          MSG
+          expect(QA::Runtime::Logger).to have_received(:debug).with('ended retry').ordered.once
+          expect(QA::Runtime::Logger).not_to have_received(:debug).with(/Attempt number/)
+        end
+      end
+
+      it 'starts logging subsequent attempts for max_attempts' do
+        attempts = 0
+        subject.repeat_until(max_attempts: 4, raise_on_failure: false) do
+          next true if attempts == 2
+
+          attempts += 1
+          false
         end
-      end.not_to output.to_stdout_from_any_process
+
+        aggregate_failures do
+          expect(QA::Runtime::Logger).to have_received(:debug).with(<<~MSG.strip).ordered.once
+            Retrying action with: max_attempts: 4; sleep_interval: 0; raise_on_failure: false; retry_on_exception: false
+          MSG
+          expect(QA::Runtime::Logger).to have_received(:debug).with('Attempt number 2').ordered.once
+          expect(QA::Runtime::Logger).to have_received(:debug).with('Attempt number 3').ordered.once
+          expect(QA::Runtime::Logger).to have_received(:debug).with('ended retry').ordered.once
+        end
+      end
     end
   end
 end
diff --git a/qa/spec/support/retrier_spec.rb b/qa/spec/support/retrier_spec.rb
index 9ad3e85fea9..1f303093a00 100644
--- a/qa/spec/support/retrier_spec.rb
+++ b/qa/spec/support/retrier_spec.rb
@@ -1,42 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe QA::Support::Retrier do
-  before do
-    logger = ::Logger.new $stdout
-    logger.level = ::Logger::DEBUG
-    QA::Runtime::Logger.logger = logger
-  end
-
   describe '.retry_until' do
-    context 'when the condition is true' do
-      it 'logs max attempts (3 by default)' do
-        expect { subject.retry_until { true } }
-          .to output(/with retry_until: max_attempts: 3; reload_page: ; sleep_interval: 0; raise_on_failure: true; retry_on_exception: false/).to_stdout_from_any_process
-      end
-
-      it 'logs max duration' do
-        expect { subject.retry_until(max_duration: 1) { true } }
-          .to output(/with retry_until: max_duration: 1; reload_page: ; sleep_interval: 0; raise_on_failure: true; retry_on_exception: false/).to_stdout_from_any_process
-      end
-
-      it 'logs the end' do
-        expect { subject.retry_until { true } }
-        .to output(/ended retry_until$/).to_stdout_from_any_process
-      end
-    end
-
-    context 'when the condition is false' do
-      it 'logs the start' do
-        expect { subject.retry_until(max_duration: 0, raise_on_failure: false) { false } }
-          .to output(/with retry_until: max_duration: 0; reload_page: ; sleep_interval: 0; raise_on_failure: false; retry_on_exception: false/).to_stdout_from_any_process
-      end
-
-      it 'logs the end' do
-        expect { subject.retry_until(max_duration: 0, raise_on_failure: false) { false } }
-        .to output(/ended retry_until$/).to_stdout_from_any_process
-      end
-    end
-
     context 'when max_duration and max_attempts are nil' do
       it 'sets max attempts to 3 by default' do
         expect(subject).to receive(:repeat_until).with(hash_including(max_attempts: 3))
@@ -62,35 +27,21 @@ RSpec.describe QA::Support::Retrier do
 
       subject.retry_until
     end
-  end
 
-  describe '.retry_on_exception' do
-    context 'when the condition is true' do
-      it 'logs max_attempts, reload_page, and sleep_interval parameters' do
-        message = /with retry_on_exception: max_attempts: 1; reload_page: true; sleep_interval: 0/
-        expect { subject.retry_on_exception(max_attempts: 1, reload_page: true, sleep_interval: 0) { true } }
-          .to output(message).to_stdout_from_any_process
-      end
+    it 'allows logs to be silenced' do
+      expect(subject).to receive(:repeat_until).with(hash_including(log: false))
 
-      it 'logs the end' do
-        expect { subject.retry_on_exception(max_attempts: 1, reload_page: nil, sleep_interval: 0) { true } }
-        .to output(/ended retry_on_exception$/).to_stdout_from_any_process
-      end
+      subject.retry_until(log: false)
     end
 
-    context 'when the condition is false' do
-      it 'logs the start' do
-        message = /with retry_on_exception: max_attempts: 1; reload_page: true; sleep_interval: 0/
-        expect { subject.retry_on_exception(max_attempts: 1, reload_page: true, sleep_interval: 0) { false } }
-          .to output(message).to_stdout_from_any_process
-      end
+    it 'sets custom error message' do
+      expect(subject).to receive(:repeat_until).with(hash_including(message: 'Custom message'))
 
-      it 'logs the end' do
-        expect { subject.retry_on_exception(max_attempts: 1, reload_page: nil, sleep_interval: 0) { false } }
-        .to output(/ended retry_on_exception$/).to_stdout_from_any_process
-      end
+      subject.retry_until(message: 'Custom message')
     end
+  end
 
+  describe '.retry_on_exception' do
     it 'does not repeat if no exception is raised' do
       loop_counter = 0
       return_value = "test passed"
@@ -121,5 +72,11 @@ RSpec.describe QA::Support::Retrier do
 
       subject.retry_on_exception
     end
+
+    it 'allows logs to be silenced' do
+      expect(subject).to receive(:repeat_until).with(hash_including(log: false))
+
+      subject.retry_on_exception(log: false)
+    end
   end
 end
diff --git a/qa/spec/support/shared_contexts/packages_registry_shared_context.rb b/qa/spec/support/shared_contexts/packages_registry_shared_context.rb
index 6e197015640..e686d254a44 100644
--- a/qa/spec/support/shared_contexts/packages_registry_shared_context.rb
+++ b/qa/spec/support/shared_contexts/packages_registry_shared_context.rb
@@ -43,8 +43,13 @@ module QA
 
     let(:project_deploy_token) do
       Resource::DeployToken.fabricate_via_browser_ui! do |deploy_token|
-        deploy_token.name = 'helm-package-deploy-token'
+        deploy_token.name = 'package-deploy-token'
         deploy_token.project = package_project
+        deploy_token.scopes = [
+          :read_repository,
+          :read_package_registry,
+          :write_package_registry
+        ]
       end
     end
 
diff --git a/qa/spec/support/waiter_spec.rb b/qa/spec/support/waiter_spec.rb
index d0b216b5dc1..c575a27bc35 100644
--- a/qa/spec/support/waiter_spec.rb
+++ b/qa/spec/support/waiter_spec.rb
@@ -1,40 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe QA::Support::Waiter do
-  before do
-    logger = ::Logger.new $stdout
-    logger.level = ::Logger::DEBUG
-    QA::Runtime::Logger.logger = logger
-  end
-
   describe '.wait_until' do
-    context 'when the condition is true' do
-      it 'logs the start' do
-        expect { subject.wait_until(max_duration: 0, raise_on_failure: false) { true } }
-        .to output(/with wait_until: max_duration: 0; reload_page: ; sleep_interval: 0.1/).to_stdout_from_any_process
-      end
-
-      it 'logs the end' do
-        expect { subject.wait_until(max_duration: 0, raise_on_failure: false) { true } }
-        .to output(/ended wait_until$/).to_stdout_from_any_process
-      end
-    end
-
-    context 'when the condition is false' do
-      it 'logs the start' do
-        expect { subject.wait_until(max_duration: 0, raise_on_failure: false) { false } }
-        .to output(/with wait_until: max_duration: 0; reload_page: ; sleep_interval: 0.1/).to_stdout_from_any_process
-      end
-
-      it 'logs the end' do
-        expect { subject.wait_until(max_duration: 0, raise_on_failure: false) { false } }
-        .to output(/ended wait_until$/).to_stdout_from_any_process
-      end
-    end
-
     it 'allows logs to be silenced' do
-      expect { subject.wait_until(max_duration: 0, raise_on_failure: false, log: false) { false } }
-        .not_to output.to_stdout_from_any_process
+      expect(subject).to receive(:repeat_until).with(hash_including(log: false))
+
+      subject.wait_until(log: false)
     end
 
     it 'sets max_duration to 60 by default' do