Skip to content

Commit 1d9b40a

Browse files
Run pdk validate -a to resolve lint problems
1 parent 77d3c42 commit 1d9b40a

File tree

11 files changed

+28
-28
lines changed

11 files changed

+28
-28
lines changed

spec/acceptance/compose_v3_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class { 'docker::compose':
3333
end
3434
end
3535

36-
context 'Creating compose v3 projects', win_broken: true do
36+
context 'Creating compose v3 projects', :win_broken do
3737
let(:install_pp) do
3838
<<-MANIFEST
3939
docker_compose { 'web':
@@ -59,7 +59,7 @@ class { 'docker::compose':
5959
end
6060
end
6161

62-
context 'creating compose projects with multi compose files', win_broken: true do
62+
context 'creating compose projects with multi compose files', :win_broken do
6363
before(:all) do
6464
install_pp = <<-MANIFEST
6565
docker_compose { 'web1':
@@ -79,7 +79,7 @@ class { 'docker::compose':
7979
end
8080
end
8181

82-
context 'Destroying project with multiple compose files', win_broken: true do
82+
context 'Destroying project with multiple compose files', :win_broken do
8383
let(:destroy_pp) do
8484
<<-MANIFEST
8585
docker_compose { 'web1':

spec/acceptance/docker_full_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
end
5050

5151
describe 'the Puppet Docker module' do
52-
context 'clean up before each test', win_broken: true do
52+
context 'clean up before each test', :win_broken do
5353
before(:each) do
5454
retry_on_error_matching(60, 5, %r{connection failure running}) do
5555
# Stop all container using systemd
@@ -70,7 +70,7 @@
7070
end
7171

7272
describe 'docker class' do
73-
context 'without any parameters', win_broken: true do
73+
context 'without any parameters', :win_broken do
7474
let(:pp) { "class { 'docker': #{docker_args} }" }
7575

7676
it 'runs successfully' do
@@ -349,7 +349,7 @@ class { 'docker': #{docker_args} }
349349
end
350350
end
351351

352-
it 'creates a new image based on a tar', win_broken: true do
352+
it 'creates a new image based on a tar', :win_broken do
353353
pp = <<-EOS
354354
class { 'docker': #{docker_args} }
355355
docker::image { '#{default_image}':
@@ -585,7 +585,7 @@ class { 'docker': #{docker_args} }
585585

586586
# cpuset is not supported on Docker Windows
587587
# STDERR: C:/Program Files/Docker/docker.exe: Error response from daemon: invalid option: Windows does not support CpusetCpus.
588-
it 'starts a container with cpuset paramater set', win_broken: true do
588+
it 'starts a container with cpuset paramater set', :win_broken do
589589
pp = <<-EOS
590590
class { 'docker': #{docker_args} }
591591
@@ -614,7 +614,7 @@ class { 'docker': #{docker_args} }
614614
end
615615

616616
# leagacy container linking was not implemented on Windows. --link is a legacy Docker feature: https://docs.docker.com/network/links/
617-
it 'starts multiple linked containers', win_broken: true do
617+
it 'starts multiple linked containers', :win_broken do
618618
pp = <<-EOS
619619
class { 'docker': #{docker_args} }
620620
@@ -669,7 +669,7 @@ class { 'docker': #{docker_args} }
669669
end
670670
end
671671

672-
it 'stops a running container', win_broken: true do
672+
it 'stops a running container', :win_broken do
673673
pp = <<-EOS
674674
class { 'docker': #{docker_args} }
675675
@@ -860,7 +860,7 @@ class { 'docker': #{docker_args} }
860860
end
861861
end
862862

863-
describe 'docker::exec', win_broken: true do
863+
describe 'docker::exec', :win_broken do
864864
it 'runs a command inside an already running container' do
865865
pp = <<-EOS
866866
class { 'docker': #{docker_args} }
@@ -919,7 +919,7 @@ class { 'docker': #{docker_args} }
919919
apply_manifest(pp_delete, catch_failures: true)
920920
end
921921

922-
it 'onlies run if notified when refreshonly is true', win_broken: true do
922+
it 'onlies run if notified when refreshonly is true', :win_broken do
923923
container_name = 'container_4_2'
924924
pp = <<-EOS
925925
class { 'docker': #{docker_args} }

spec/acceptance/docker_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ class { 'docker': #{docker_args}}
293293
sleep 10
294294
end
295295

296-
it 'is able to login to the registry', retry: 3, retry_wait: 10, win_broken: true do
296+
it 'is able to login to the registry', :win_broken, retry: 3, retry_wait: 10 do
297297
pp = <<-MANIFEST
298298
docker::registry { '#{registry_address}':
299299
username => 'username',
@@ -305,7 +305,7 @@ class { 'docker': #{docker_args}}
305305
run_shell("test -e \"#{root_dir}/registry-auth-puppet_receipt_#{server_strip}_root\"", expect_failures: false)
306306
end
307307

308-
it 'is able to logout from the registry', win_broken: true do
308+
it 'is able to logout from the registry', :win_broken do
309309
pp = <<-MANIFEST
310310
docker::registry { '#{registry_address}':
311311
ensure=> absent,
@@ -315,7 +315,7 @@ class { 'docker': #{docker_args}}
315315
run_shell("grep #{registry_address} #{config_file}", expect_failures: true)
316316
end
317317

318-
it 'does not create receipt if registry login fails', win_broken: true do
318+
it 'does not create receipt if registry login fails', :win_broken do
319319
pp = <<-MANIFEST
320320
docker::registry { '#{registry_bad_address}':
321321
username => 'username',

spec/acceptance/machine_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 'docker::machine', win_broken: true do
5+
describe 'docker::machine', :win_broken do
66
context 'with default parameters' do
77
pp = <<-EOS
88
include docker::machine

spec/acceptance/stack_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
wait_for_container_seconds = 10
1313
end
1414

15-
describe 'docker stack', win_broken: true do
15+
describe 'docker stack', :win_broken do
1616
before(:all) do
1717
retry_on_error_matching(60, 5, %r{connection failure running}) do
1818
install_pp = <<-MANIFEST

spec/classes/compose_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
'with version => 1.7.0' => {
1111
'version' => '1.7.0'
12-
},
12+
}
1313
}
1414

1515
describe 'docker::compose', type: :class do
@@ -33,7 +33,7 @@
3333
context title do
3434
params = {
3535
'ensure' => 'present',
36-
'version' => defaults['compose_version'],
36+
'version' => defaults['compose_version']
3737
}.merge(local_params)
3838

3939
let(:facts) do

spec/shared_examples/compose.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
version = _params['version']
66

77
if _params['manage_package']
8-
ensure_value =
8+
ensure_value =
99
if _params['version'] != :undef && _params['ensure'] != 'absent'
1010
_params['version']
1111
else
@@ -15,7 +15,7 @@
1515
case _facts['os']['family']
1616
when 'Debian', 'RedHat'
1717
it {
18-
is_expected.to contain_package('docker-compose-plugin').with(
18+
expect(subject).to contain_package('docker-compose-plugin').with(
1919
ensure: ensure_value,
2020
)
2121
}

spec/unit/lib/puppet/type/docker_compose_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323

2424
it 'has expected properties' do
2525
properties.each do |property|
26-
expect(compose.properties.map(&:name)).to be_include(property)
26+
expect(compose.properties.map(&:name)).to include(property)
2727
end
2828
end
2929

3030
it 'has expected parameters' do
3131
params.each do |param|
32-
expect(compose.parameters).to be_include(param)
32+
expect(compose.parameters).to include(param)
3333
end
3434
end
3535

spec/unit/lib/puppet/type/docker_network_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929

3030
it 'has expected properties' do
3131
properties.each do |property|
32-
expect(network.properties.map(&:name)).to be_include(property)
32+
expect(network.properties.map(&:name)).to include(property)
3333
end
3434
end
3535

3636
it 'has expected parameters' do
3737
params.each do |param|
38-
expect(network.parameters).to be_include(param)
38+
expect(network.parameters).to include(param)
3939
end
4040
end
4141
end

spec/unit/lib/puppet/type/docker_stack_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121

2222
it 'has expected properties' do
2323
properties.each do |property|
24-
expect(stack.properties.map(&:name)).to be_include(property)
24+
expect(stack.properties.map(&:name)).to include(property)
2525
end
2626
end
2727

2828
it 'has expected parameters' do
2929
params.each do |param|
30-
expect(stack.parameters).to be_include(param)
30+
expect(stack.parameters).to include(param)
3131
end
3232
end
3333

spec/unit/lib/puppet/type/docker_volume_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
it 'has expected properties' do
2424
properties.each do |property|
25-
expect(volume.properties.map(&:name)).to be_include(property)
25+
expect(volume.properties.map(&:name)).to include(property)
2626
end
2727
end
2828

2929
it 'has expected parameters' do
3030
params.each do |param|
31-
expect(volume.parameters).to be_include(param)
31+
expect(volume.parameters).to include(param)
3232
end
3333
end
3434
end

0 commit comments

Comments
 (0)