Skip to content

Commit 77d3021

Browse files
authored
Merge pull request puppetlabs#134 from lionce/MODULES-10422
MODULES-10422 - fix failing tests
2 parents f190f8f + f4b4fa5 commit 77d3021

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

spec/acceptance/init_spec.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,27 @@
3434
it 'restart/status a service' do
3535
result = run_bolt_task('service', 'action' => 'restart', 'name' => package_to_use)
3636
expect(result.exit_code).to eq(0)
37-
expect(result['result']).to include('status' => %r{restarted|Restarted})
37+
expect(result['result']).to include('status' => %r{restarted}i)
3838

3939
result = run_bolt_task('service', 'action' => 'status', 'name' => package_to_use)
4040
expect(result.exit_code).to eq(0)
41-
expect(result['result']).to include('status' => %r{running|Started})
42-
expect(result['result']).to include('enabled' => %r{true|Manual|Automatic})
41+
expect(result['result']).to include('status' => %r{running|Started}i)
42+
expect(result['result']).to include('enabled' => %r{true|manual|automatic}i)
4343
end
4444
end
4545

4646
describe 'stop action' do
4747
it 'stop/status a service' do
4848
result = run_bolt_task('service', 'action' => 'stop', 'name' => package_to_use)
4949
expect(result.exit_code).to eq(0)
50-
expect(result['result']).to include('status' => %r{in_sync|stopped|Stopped})
50+
expect(result['result']).to include('status' => %r{in_sync|stopped}i)
5151

5252
# Debian can give incorrect status
5353
unless ['debian', 'ubuntu'].include?(os[:family])
5454
result = run_bolt_task('service', 'action' => 'status', 'name' => package_to_use)
5555
expect(result.exit_code).to eq(0)
56-
expect(result['result']).to include('status' => %r{stopped|Stopped})
57-
expect(result['result']).to include('enabled' => %r{true|Manual|Automatic})
56+
expect(result['result']).to include('status' => %r{stopped}i)
57+
expect(result['result']).to include('enabled' => %r{true|manual|automatic}i)
5858
end
5959
end
6060
end
@@ -63,14 +63,14 @@
6363
it 'start/status a service' do
6464
result = run_bolt_task('service', 'action' => 'start', 'name' => package_to_use)
6565
expect(result.exit_code).to eq(0)
66-
expect(result['result']).to include('status' => %r{in_sync|started|Started})
66+
expect(result['result']).to include('status' => %r{in_sync|started}i)
6767

6868
# Debian can give incorrect status
6969
unless ['debian', 'ubuntu'].include?(os[:family])
7070
result = run_bolt_task('service', 'action' => 'status', 'name' => package_to_use)
7171
expect(result.exit_code).to eq(0)
72-
expect(result['result']).to include('status' => %r{running|Started})
73-
expect(result['result']).to include('enabled' => %r{true|Manual|Automatic})
72+
expect(result['result']).to include('status' => %r{running|Started}i)
73+
expect(result['result']).to include('enabled' => %r{true|manual|automatic}i)
7474
end
7575
end
7676
end

0 commit comments

Comments
 (0)