Skip to content

Commit bd586a1

Browse files
author
carabasdaniel
authored
Merge pull request #288 from adrianiurca/iac1527/remove-bolt-spec-filters
(IAC-1527) remove bolt filters
2 parents 55c653c + 8cf752b commit bd586a1

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

spec/acceptance/tasks/init_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require 'spec_helper_acceptance'
44

5-
describe 'reboot task', bolt: true do
5+
describe 'reboot task' do
66
let(:tm) { 60 }
77
let(:bolt_default_reboot_args) { ['-r', '+1', "''", '</dev/null', '>/dev/null', '2>&1', '&'] }
88
let(:bolt_reboot_args_with_msg) { ['-r', '+1', 'Bolt\\', 'is\\', 'rebooting\\', 'the\\', 'computer', '</dev/null', '>/dev/null', '2>&1', '&'] }

spec/plans/init_spec.rb

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@
22

33
require 'spec_helper'
44

5-
def should_run_tests?
6-
ENV['GEM_BOLT'] && ENV['PUPPET_GEM_VERSION'] != '~> 5.0'
7-
end
85
# Tests generally use 0 timeouts to skip sleep in plans.
9-
describe 'reboot plan', if: should_run_tests?, bolt: true do
10-
if should_run_tests?
11-
require 'bolt_spec/plans'
12-
include BoltSpec::Plans
13-
BoltSpec::Plans.init
14-
end
6+
describe 'reboot plan' do
7+
require 'bolt_spec/plans'
8+
include BoltSpec::Plans
9+
BoltSpec::Plans.init
1510

1611
it 'reboots a target' do
1712
time_seq = [Time.now - 1, Time.now]

spec/spec_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
Puppet.settings[:strict] = :warning
4545
Puppet.settings[:strict_variables] = true
4646
end
47-
c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
4847
c.after(:suite) do
4948
RSpec::Puppet::Coverage.report!(0)
5049
end

spec/spec_helper_acceptance_local.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ def substitute_shutdown_on_path
3333
end
3434

3535
RSpec.configure do |c|
36-
# Skip tasks tests unless Bolt is available
37-
c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
3836
c.include PuppetLitmus::Util
3937
c.extend PuppetLitmus::Util
4038

0 commit comments

Comments
 (0)