gitlab-qa 6.3.0 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c99ceb7cdd5d4c53dabf353157bbaf334c7c67febb2afc93620e8bca0fe3774
-  data.tar.gz: a0d26ee7c892402f37cb9bc0e311f649687878fb088bca8c881ce64a5a0bcd54
+  metadata.gz: 12e0b622362bae1054406a72f79f42a29582f9ebca8162a2c3f2d8128c9938f6
+  data.tar.gz: fbaa6130f08f1a082cb90e4e1a5c65d7fb253b9f311cbaeb5937b3aa752ce20b
 SHA512:
-  metadata.gz: 6984d1bcbfb7939d2b806f9857b6403db776458eba0c89ee719be35f563b4a96076a80ca2cf8bb765e4eccf819e7554343c59b08c702d8d45d4d0c85bcde618c
-  data.tar.gz: 4c44818ae663d2eece632825d8efd12535312f71a98e7211ab8b431b8dec5d8561d339a1b69e3884797f3324cb049b64164da4be4c0064c329de600cf731d020
+  metadata.gz: 9bdd569f223141416086e574911e71fc2350b55b487644ccdc68524cee0da8ee0c5ddaa9c26be1877cc2b218045b736a3212b71a26188f3770ac8355bfd8cf69
+  data.tar.gz: e4a83ae9c48728baef2ea881f1abcd50476ce96e59ef1579b788eb6c58812c9aa27a40397caaf7293c71dd5bf1e6614e5607d2d41d438447c3badeafc9cd4595

data/lib/gitlab/qa.rb

@@ -98,6 +98,7 @@ module Gitlab
 
     module Report
       autoload :GitlabIssueClient, 'gitlab/qa/report/gitlab_issue_client'
+      autoload :BaseTestResults, 'gitlab/qa/report/base_test_results'
       autoload :JsonTestResults, 'gitlab/qa/report/json_test_results'
       autoload :JUnitTestResults, 'gitlab/qa/report/junit_test_results'
       autoload :PrepareStageReports, 'gitlab/qa/report/prepare_stage_reports'

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

@@ -128,10 +128,10 @@ module Gitlab
           end
         end
 
-        def wait
+        def wait_until_ready
           return if skip_availability_check
 
-          if Availability.new(name, relative_path: relative_path, scheme: scheme, protocol_port: port.to_i).check(180)
+          if Availability.new(name, relative_path: relative_path, scheme: scheme, protocol_port: port.to_i).check(300)
             sleep 12 # TODO, handle that better
             puts ' -> GitLab is available.'
           else

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Report
+      class BaseTestResults
+        include Enumerable
+
+        def initialize(path)
+          @results = parse(path)
+          @testcases = process
+        end
+
+        def each(&block)
+          testcases.each(&block)
+        end
+
+        def write(path)
+          raise NotImplementedError
+        end
+
+        private
+
+        attr_reader :results, :testcases
+
+        def parse(path)
+          raise NotImplementedError
+        end
+
+        def process
+          raise NotImplementedError
+        end
+      end
+    end
+  end
+end

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

@@ -5,15 +5,23 @@ require 'json'
 module Gitlab
   module QA
     module Report
-      class JsonTestResults
-        include Enumerable
+      class JsonTestResults < BaseTestResults
+        def write(path)
+          json = results.merge('examples' => testcases.map(&:report))
 
-        def initialize(file)
-          @testcases = JSON.parse(File.read(file))['examples'].map { |test| TestResult.from_json(test) }
+          File.write(path, JSON.pretty_generate(json))
         end
 
-        def each(&block)
-          @testcases.each(&block)
+        private
+
+        def parse(path)
+          JSON.parse(File.read(path))
+        end
+
+        def process
+          results['examples'].map do |test|
+            TestResult.from_json(test)
+          end
         end
       end
     end

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

@@ -5,15 +5,21 @@ require 'nokogiri'
 module Gitlab
   module QA
     module Report
-      class JUnitTestResults
-        include Enumerable
+      class JUnitTestResults < BaseTestResults
+        def write(path)
+          # Ignore it for now
+        end
+
+        private
 
-        def initialize(file)
-          @testcases = Nokogiri::XML(File.read(file)).xpath('//testcase').map { |test| TestResult.from_junit(test) }
+        def parse(path)
+          Nokogiri::XML.parse(File.read(path))
         end
 
-        def each(&block)
-          @testcases.each(&block)
+        def process
+          results.xpath('//testcase').map do |test|
+            TestResult.from_junit(test)
+          end
         end
       end
     end

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

@@ -15,15 +15,15 @@ module Gitlab
         def run!
           puts "Reporting test results in `#{files.join(',')}` as issues in project `#{project}` via the API at `#{Runtime::Env.gitlab_api_base}`."
 
-          Dir.glob(files).each do |file|
-            puts "Reporting tests in #{file}"
-            extension = File.extname(file)
+          Dir.glob(files).each do |path|
+            puts "Reporting tests in #{path}"
+            extension = File.extname(path)
 
             case extension
             when '.json'
-              test_results = Report::JsonTestResults.new(file)
+              test_results = Report::JsonTestResults.new(path)
             when '.xml'
-              test_results = Report::JUnitTestResults.new(file)
+              test_results = Report::JUnitTestResults.new(path)
             else
               raise "Unknown extension #{extension}"
             end
@@ -31,6 +31,8 @@ module Gitlab
             test_results.each do |test|
               report_test(test)
             end
+
+            test_results.write(path)
           end
         end
 
@@ -48,6 +50,8 @@ module Gitlab
             puts "Created new issue: #{issue.web_url}"
           end
 
+          test.testcase ||= issue.web_url
+
           update_labels(issue, test)
           note_status(issue, test)
 

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

@@ -4,60 +4,114 @@ module Gitlab
   module QA
     module Report
       class TestResult
-        attr_accessor :name, :file, :skipped, :failures, :testcase
-
-        def self.from_json(test)
-          new.tap do |test_result|
-            test_result.name = test['full_description']
-            test_result.file = test['file_path']
-            test_result.skipped = test['status'] == 'pending'
-            test_result.failures = failures_from_json_exceptions(test)
-            test_result.testcase = test['testcase']
-          end
+        def self.from_json(report)
+          JsonTestResult.new(report)
         end
 
-        def self.from_junit(test)
-          new.tap do |test_result|
-            test_result.name = test['name']
-            test_result.file = test['file']
-            test_result.skipped = test.search('skipped').any?
-            test_result.failures = failures_from_junit_exceptions(test)
-          end
+        def self.from_junit(report)
+          JUnitTestResult.new(report)
         end
 
-        def self.failures_from_json_exceptions(test)
-          return [] unless test.key?('exceptions')
+        attr_accessor :report, :failures
 
-          test['exceptions'].map do |exception|
-            spec_file_first_index = exception['backtrace'].rindex do |line|
-              line.include?(File.basename(test['file_path']))
-            end
+        def initialize(report)
+          self.report = report
+          self.failures = failures_from_exceptions
+        end
 
-            {
-              'message' => "#{exception['class']}: #{exception['message']}",
-              'stacktrace' => "#{exception['message_lines'].join("\n")}\n#{exception['backtrace'].slice(0..spec_file_first_index).join("\n")}"
-            }
-          end
+        def name
+          raise NotImplementedError
         end
-        private_class_method :failures_from_json_exceptions
 
-        def self.failures_from_junit_exceptions(test)
-          failures = test.search('failure')
-          return [] if failures.empty?
+        def file
+          raise NotImplementedError
+        end
+
+        def skipped
+          raise NotImplementedError
+        end
+
+        private
+
+        def failures_from_exceptions
+          raise NotImplementedError
+        end
+
+        class JsonTestResult < TestResult
+          def name
+            report['full_description']
+          end
+
+          def file
+            report['file_path']
+          end
+
+          def skipped
+            report['status'] == 'pending'
+          end
+
+          def testcase
+            report['testcase']
+          end
 
-          failures.map do |exception|
-            trace = exception.content.split("\n").map(&:strip)
-            spec_file_first_index = trace.rindex do |line|
-              line.include?(File.basename(test['file']))
+          def testcase=(new_testcase)
+            report['testcase'] = new_testcase
+          end
+
+          private
+
+          # rubocop:disable Metrics/AbcSize
+          def failures_from_exceptions
+            return [] unless report.key?('exceptions')
+
+            report['exceptions'].map do |exception|
+              spec_file_first_index = exception['backtrace'].rindex do |line|
+                line.include?(File.basename(report['file_path']))
+              end
+
+              {
+                'message' => "#{exception['class']}: #{exception['message']}",
+                'stacktrace' => "#{exception['message_lines'].join("\n")}\n#{exception['backtrace'].slice(0..spec_file_first_index).join("\n")}"
+              }
             end
+          end
+          # rubocop:enable Metrics/AbcSize
+        end
+
+        class JUnitTestResult < TestResult
+          def name
+            report['name']
+          end
 
-            {
-              'message' => "#{exception['type']}: #{exception['message']}",
-              'stacktrace' => trace.slice(0..spec_file_first_index).join("\n")
-            }
+          def file
+            report['file']
+          end
+
+          def skipped
+            report.search('skipped').any?
+          end
+
+          attr_accessor :testcase # Ignore it for now
+
+          private
+
+          def failures_from_exceptions
+            failures = report.search('failure')
+            return [] if failures.empty?
+
+            failures.map do |exception|
+              trace = exception.content.split("\n").map(&:strip)
+              spec_file_first_index = trace.rindex do |line|
+                line.include?(File.basename(report['file']))
+              end
+
+              {
+                'message' => "#{exception['type']}: #{exception['message']}",
+                'stacktrace' => trace.slice(0..spec_file_first_index).join("\n")
+              }
+            end
           end
         end
-        private_class_method :failures_from_junit_exceptions
       end
     end
   end

data/lib/gitlab/qa/runtime/env.rb

@@ -62,6 +62,7 @@ module Gitlab
           'KNAPSACK_TEST_FILE_PATTERN' => :knapsack_test_file_pattern,
           'KNAPSACK_TEST_DIR' => :knapsack_test_dir,
           'CI' => :ci,
+          'CI_JOB_ID' => :ci_job_id,
           'CI_RUNNER_ID' => :ci_runner_id,
           'CI_SERVER_HOST' => :ci_server_host,
           'CI_SERVER_PERSONAL_ACCESS_TOKEN' => :ci_server_personal_access_token,

data/lib/gitlab/qa/scenario/test/integration/praefect.rb

@@ -24,7 +24,7 @@ module Gitlab
                     start
                     reconfigure
                     process_exec_commands
-                    wait
+                    wait_until_ready
                     teardown!
                   end
                 end
@@ -41,7 +41,7 @@ module Gitlab
                     prepare_gitlab_omnibus_config
                     start
                     reconfigure
-                    wait
+                    wait_until_ready
 
                     puts "Running Praefect specs!"
 

data/lib/gitlab/qa/scenario/test/omnibus/image.rb

@@ -15,7 +15,7 @@ module Gitlab
                   reconfigure
 
                   restart
-                  wait
+                  wait_until_ready
                   teardown
                 end
               end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '6.3.0'.freeze
+    VERSION = '6.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.4.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -257,6 +257,7 @@ files:
 - lib/gitlab/qa/docker/shellout.rb
 - lib/gitlab/qa/docker/volumes.rb
 - lib/gitlab/qa/release.rb
+- lib/gitlab/qa/report/base_test_results.rb
 - lib/gitlab/qa/report/gitlab_issue_client.rb
 - lib/gitlab/qa/report/json_test_results.rb
 - lib/gitlab/qa/report/junit_test_results.rb