Multiple fixes to make tests pass in Zuul
* Relax the version requirement for bundler * Use SpecReporter when running in CI * Don’t require pry when running in CI * Only include Coveralls if running in Travis * Don’t include .bundled_gems/ in coverage report Change-Id: I79b8ea741ce783aa73b4301c52d2021fe2d1b81d
This commit is contained in:
parent
f7a00dca77
commit
18163f8659
|
@ -24,18 +24,18 @@ Gem::Specification.new do |spec|
|
|||
spec.add_dependency 'thor', '~> 0.18.1'
|
||||
spec.add_dependency 'terminal-table', '>= 1.4.5'
|
||||
|
||||
spec.add_development_dependency "bundler", "~> 1.3"
|
||||
spec.add_development_dependency "bundler", ">= 1.0"
|
||||
spec.add_development_dependency 'rb-fsevent', '~> 0.9.0'
|
||||
spec.add_development_dependency 'guard', '~> 1.8.0'
|
||||
spec.add_development_dependency 'guard-rake', '~> 0.0.0'
|
||||
spec.add_development_dependency 'guard-minitest', '~> 0.5.0'
|
||||
|
||||
|
||||
if /darwin|mac os/ === RbConfig::CONFIG['host_os']
|
||||
spec.add_development_dependency 'terminal-notifier-guard', '~> 1.5.3'
|
||||
else
|
||||
spec.add_development_dependency 'ruby_gntp', '~> 0.3.0'
|
||||
end
|
||||
|
||||
|
||||
spec.add_development_dependency 'pry', '~> 0.9.0'
|
||||
spec.add_development_dependency 'yard', '~> 0.8.0'
|
||||
spec.add_development_dependency 'redcarpet', '~> 2.3.0'
|
||||
|
|
|
@ -44,4 +44,8 @@ class Test
|
|||
end
|
||||
end
|
||||
|
||||
MiniTest::Reporters.use! Aviator::Test::ProgressReporter.new
|
||||
if running_in_ci
|
||||
MiniTest::Reporters.use! Aviator::Test::SpecReporter.new
|
||||
else
|
||||
MiniTest::Reporters.use! Aviator::Test::ProgressReporter.new
|
||||
end
|
||||
|
|
|
@ -6,12 +6,18 @@ $:.unshift File.expand_path('../../lib', __FILE__)
|
|||
require 'simplecov'
|
||||
require 'coveralls'
|
||||
SimpleCov.command_name 'MiniTest'
|
||||
SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
|
||||
SimpleCov::Formatter::HTMLFormatter,
|
||||
Coveralls::SimpleCov::Formatter
|
||||
]
|
||||
SimpleCov.formatter = if ENV['TRAVIS']
|
||||
SimpleCov::Formatter::MultiFormatter[
|
||||
SimpleCov::Formatter::HTMLFormatter,
|
||||
Coveralls::SimpleCov::Formatter
|
||||
]
|
||||
else
|
||||
SimpleCov::Formatter::HTMLFormatter
|
||||
end
|
||||
|
||||
SimpleCov.start do
|
||||
add_filter '/test/'
|
||||
add_filter '/.bundled_gems/'
|
||||
|
||||
add_group 'Core', 'lib/aviator/core'
|
||||
add_group 'OpenStack', 'lib/aviator/openstack'
|
||||
|
@ -19,8 +25,12 @@ end
|
|||
|
||||
require 'minitest/autorun'
|
||||
|
||||
# Do not require these gems when running in the CI
|
||||
unless ENV['CI'] || ENV['TRAVIS']
|
||||
# May be used by other test helpers under test/support
|
||||
def running_in_ci
|
||||
['BUILD_NUMBER', 'CI', 'JENKINS_URL'].any? { |name| ENV.key? name }
|
||||
end
|
||||
|
||||
unless running_in_ci
|
||||
require 'pry'
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue