ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix build summary page to work with rspecQ 

fixes: DE-878

Change-Id: I1012afec3f25e2ce26bb10505286c345b3d37f47
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/274685
Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
This commit is contained in:
James Butters 2021-09-28 13:23:42 -06:00
parent 3e38d9d83a
commit 0d1cd8daa6
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.d/test.rb
View File

@ -62,7 +62,7 @@ group :test do
gem 'json-schema', '~> 2.8.1' gem 'json-schema', '~> 2.8.1'
gem 'parallel_tests' gem 'parallel_tests'
gem 'rspecq', github: 'kyler-instructure/rspecq', ref: 'b5a638f114fe66521fc46826e0afe5bd41258b0f' gem 'rspecq', github: 'kyler-instructure/rspecq', ref: 'a49343fa7eab3329cd5dd86d059b33fc6fee0ce3'
gem 'flakey_spec_catcher', require: false gem 'flakey_spec_catcher', require: false
gem 'factory_bot', '6.1.0', require: false gem 'factory_bot', '6.1.0', require: false
gem 'rspec_junit_formatter', require: false gem 'rspec_junit_formatter', require: false

2
build/new-jenkins/library/vars/rspecStage.groovy
View File

@ -54,7 +54,7 @@ def createDistribution(nestedStages) {
'COMPOSE_FILE=docker-compose.new-jenkins.yml:docker-compose.new-jenkins-selenium.yml', 'COMPOSE_FILE=docker-compose.new-jenkins.yml:docker-compose.new-jenkins-selenium.yml',
'EXCLUDE_TESTS=.*/(selenium/performance|instfs/selenium|contracts)', 'EXCLUDE_TESTS=.*/(selenium/performance|instfs/selenium|contracts)',
"FORCE_FAILURE=${configuration.isForceFailureSelenium() ? '1' : ''}", "FORCE_FAILURE=${configuration.isForceFailureSelenium() ? '1' : ''}",
"RERUNS_RETRY=${configuration.getInteger('rspec-rerun-retry')}", "RERUNS_RETRY=${configuration.getInteger('rspecq-max-requeues')}",
"RSPEC_PROCESSES=${configuration.getInteger('rspecq-processes')}", "RSPEC_PROCESSES=${configuration.getInteger('rspecq-processes')}",
"RSPECQ_FILE_SPLIT_THRESHOLD=${configuration.fileSplitThreshold()}", "RSPECQ_FILE_SPLIT_THRESHOLD=${configuration.fileSplitThreshold()}",
"RSPECQ_MAX_REQUEUES=${configuration.getInteger('rspecq-max-requeues')}", "RSPECQ_MAX_REQUEUES=${configuration.getInteger('rspecq-max-requeues')}",

4
spec/formatters/error_context/base_formatter.rb
View File

@ -87,6 +87,8 @@ module ErrorContext
def start(example) def start(example)
@summary ||= begin @summary ||= begin
summary = new(example) summary = new(example)
@errors_path = nil
@base_error_path = nil
summary.start summary.start
summary summary
end end
@ -120,7 +122,7 @@ module ErrorContext
end end
def base_error_path def base_error_path
@base_error_path ||= ENV.fetch("ERROR_CONTEXT_BASE_PATH", Rails.root.join("log", "spec_failures")) @base_error_path ||= ENV.fetch("ERROR_CONTEXT_BASE_PATH", Rails.root.join("log", "spec_failures", "Initial"))
end end
end end