summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/parsers/test/junit.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-27 06:07:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-27 06:07:47 +0000
commitd2b64c37bdef067656fdc8deb4728a2fbc6c2729 (patch)
tree5cab5936f9c176f81d9749baf4ccbdcf94be9e64 /lib/gitlab/ci/parsers/test/junit.rb
parent4560c92ab1954cf0416bafc45d1fa671fcacb3c3 (diff)
downloadgitlab-ce-d2b64c37bdef067656fdc8deb4728a2fbc6c2729.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/parsers/test/junit.rb')
-rw-r--r--lib/gitlab/ci/parsers/test/junit.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/gitlab/ci/parsers/test/junit.rb b/lib/gitlab/ci/parsers/test/junit.rb
index c3e4c88d077..33140b4c7fd 100644
--- a/lib/gitlab/ci/parsers/test/junit.rb
+++ b/lib/gitlab/ci/parsers/test/junit.rb
@@ -47,13 +47,16 @@ module Gitlab
end
def create_test_case(data, args)
- if data['failure']
+ if data.key?('failure')
status = ::Gitlab::Ci::Reports::TestCase::STATUS_FAILED
system_output = data['failure']
attachment = attachment_path(data['system_out'])
- elsif data['error']
+ elsif data.key?('error')
status = ::Gitlab::Ci::Reports::TestCase::STATUS_ERROR
system_output = data['error']
+ elsif data.key?('skipped')
+ status = ::Gitlab::Ci::Reports::TestCase::STATUS_SKIPPED
+ system_output = data['skipped']
else
status = ::Gitlab::Ci::Reports::TestCase::STATUS_SUCCESS
system_output = nil