Skip to content

Commit 1e9128f

Browse files
authored
Merge pull request #682 from pmcmaw/paralell_tests_modulesync
This is to pin ruby version to parallel_tests
2 parents abb2c51 + 3742bd6 commit 1e9128f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.sync.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
- 'spec/fixtures/manifests/site.pp'
66
- 'spec/fixtures/modules/*'
77

8+
spec/spec_helper.rb:
9+
allow_deprecations: true

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ matrix:
2828
- rvm: 2.1.5
2929
bundler_args: --without system_tests
3030
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
31-
- rvm: 2.1.5
32-
bundler_args: --without system_tests
33-
env: PUPPET_GEM_VERSION="~> 3.7.0" FUTURE_PARSER="yes"
3431
- rvm: 2.1.5
3532
bundler_args: --without system_tests
3633
env: PUPPET_GEM_VERSION="~> 3.0"

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ group :development, :unit_tests do
2626
gem 'mocha', '< 1.2.0'
2727
gem 'rspec-puppet-facts'
2828
gem 'simplecov'
29-
gem 'parallel_tests'
29+
gem 'parallel_tests', '< 2.10.0' if RUBY_VERSION < '2.0.0'
30+
gem 'parallel_tests' if RUBY_VERSION >= '2.0.0'
3031
gem 'rubocop', '0.41.2' if RUBY_VERSION < '2.0.0'
3132
gem 'rubocop' if RUBY_VERSION >= '2.0.0'
3233
gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'

0 commit comments

Comments
 (0)