gitlab-qa 6.9.0 → 6.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b693b59123428d4f6cf80c195c18fe7158692265e0deb58ddaf07f188c2a3dae
-  data.tar.gz: 87f5ce39795d8cac33e3451ffff072a0c80ca9f7409278e7b32474b8f126b7f7
+  metadata.gz: e7b24a0d671a29568447a0db95b57a06c43ed750d220dc13a0ad8216b7ba6297
+  data.tar.gz: 9e03938be0b67f4f9a522703156bfc1b191ac0b8b97661c5eb74b82bfd91c84f
 SHA512:
-  metadata.gz: fe82ec388fa1d1f30b372b953376c7ef91c16e278c5c23f8b6d998919670e8e4fcab1f5f7980ba9bc091f6283fd7cfef9fecbc6b2a81203251447cbe475ef878
-  data.tar.gz: a82012a1e3fe6353dfd420dc4500c8b7655751ba9f882865d7bd87d42b463a757c8e05aaba00c73a8644e577b6fb812bb1d14f9b68d8c9962ac65570fbb52066
+  metadata.gz: 21ea402dd74ab453e9ac303303f50925a32a82e58b7e4ff0aa57721d4e8301717febc4da56b1b5b3c7141ad7f0e613b56fc7d47b7a25256b83f07ec53980db33
+  data.tar.gz: e31d991f0f78bfc510dbaafb3a844126d95c2e46655b2d655c256dcdfda673ca8038085c33deb65caa00728effb63e75020e3f6c217ddc697e87ceaded1270ba

data/gitlab-qa.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 0.82.0'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.36'
   spec.add_development_dependency 'webmock', '3.7.0'
-  spec.add_runtime_dependency 'activesupport', '~>  6.0.2'
-  spec.add_runtime_dependency 'gitlab', '~>  4.11.0'
+  spec.add_runtime_dependency 'activesupport', '~> 6.0.2'
+  spec.add_runtime_dependency 'gitlab', '~> 4.16.1'
   spec.add_runtime_dependency 'http', '4.3.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'
   spec.add_runtime_dependency 'table_print', '1.5.6'

data/lib/gitlab/qa/component/base.rb

@@ -53,6 +53,7 @@ module Gitlab
 
         def prepare
           prepare_docker_image
+          prepare_docker_container
           prepare_network
         end
 
@@ -70,6 +71,12 @@ module Gitlab
           docker.network_create(network)
         end
 
+        def prepare_docker_container
+          return unless docker.container_exists?(name)
+
+          docker.remove(name)
+        end
+
         def start # rubocop:disable Metrics/AbcSize
           docker.run(image, tag) do |command|
             command << "-d"

data/lib/gitlab/qa/docker/engine.rb

@@ -63,6 +63,14 @@ module Gitlab
           Docker::Command.execute("rm -f #{name}")
         end
 
+        def container_exists?(name)
+          Docker::Command.execute("container inspect #{name}")
+        rescue Docker::Shellout::StatusError
+          false
+        else
+          true
+        end
+
         def network_exists?(name)
           Docker::Command.execute("network inspect #{name}")
         rescue Docker::Shellout::StatusError

data/lib/gitlab/qa/report/generate_test_session.rb

@@ -161,11 +161,11 @@ module Gitlab
         end
 
         def generate_test_job(tests_with_same_testcase)
-          tests_with_same_testcase.map(&:ci_job_url).uniq.map do |ci_job_url|
-            ci_job_id = ci_job_url[/\d+\z/]
+          tests_with_same_testcase.map do |test|
+            ci_job_id = test.ci_job_url[/\d+\z/]
 
-            "[#{ci_job_id}](#{ci_job_url})"
-          end.join(', ')
+            "[#{ci_job_id}](#{test.ci_job_url})#{' ~"quarantine"' if test.quarantine?}"
+          end.uniq.join(', ')
         end
 
         def generate_test_status(tests_with_same_testcase)

data/lib/gitlab/qa/report/gitlab_issue_client.rb

@@ -59,7 +59,7 @@ module Gitlab
 
         def find_issue_discussions(iid:)
           handle_gitlab_client_exceptions do
-            Gitlab.issue_discussions(project, iid, order_by: 'created_at', sort: 'asc')
+            Gitlab.issue_discussions(project, iid, order_by: 'created_at', sort: 'asc').auto_paginate
           end
         end
 

data/lib/gitlab/qa/report/results_in_issues.rb

@@ -41,9 +41,13 @@ module Gitlab
           test.testcase ||= issue.web_url
 
           update_labels(issue, test)
-          note_status(issue, test)
+          note_posted = note_status(issue, test)
 
-          puts "Issue updated"
+          if note_posted
+            puts "Issue updated."
+          else
+            puts "Test passed, no update needed."
+          end
         end
 
         def find_issue(test)
@@ -79,7 +83,7 @@ module Gitlab
         end
 
         def note_status(issue, test)
-          return if test.failures.empty?
+          return false if test.failures.empty?
 
           note = note_content(test)
 
@@ -88,6 +92,8 @@ module Gitlab
           end
 
           gitlab.create_issue_note(iid: issue.iid, note: note)
+
+          true
         end
 
         def note_content(test)
@@ -125,11 +131,7 @@ module Gitlab
         end
 
         def error_and_stack_trace(text)
-          result = text.strip[/Error:(.*)/m, 1].to_s
-
-          warn "Could not find `Error:` in text: #{text}" if result.empty?
-
-          result
+          text.strip[/Error:(.*)/m, 1].to_s
         end
       end
     end

data/lib/gitlab/qa/report/test_result.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/object/blank'
+
 module Gitlab
   module QA
     module Report
@@ -78,6 +80,13 @@ module Gitlab
             report['failure_issue'] = new_failure_issue
           end
 
+          def quarantine?
+            # The value for 'quarantine' could be nil, a hash, a string,
+            # or true (if the test just has the :quarantine tag)
+            # But any non-nil or false value should means the test is in quarantine
+            report['quarantine'].present?
+          end
+
           private
 
           # rubocop:disable Metrics/AbcSize

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '6.9.0'.freeze
+    VERSION = '6.10.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 6.9.0
+  version: 6.10.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.16.1
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement