Skip to content

Commit 04ed40c

Browse files
committed
fix test order
1 parent afb0249 commit 04ed40c

File tree

1 file changed

+29
-37
lines changed

1 file changed

+29
-37
lines changed

Diff for: spec/acceptance/docker_full_spec.rb

+29-37
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,35 @@ class { 'docker': #{docker_args} }
835835
apply_manifest(pp_delete, catch_failures: true)
836836
end
837837
end
838+
839+
it 'run with verify_digest' do
840+
pp = <<-EOS
841+
class { 'docker': #{docker_args} }
842+
docker::image { '#{default_image}:#{default_image_tag}':
843+
require => Class['docker'],
844+
}
845+
docker::run { '#{default_image}':
846+
image => '#{default_image}:#{default_image_tag}',
847+
verify_digest => '#{default_local_digest}',
848+
}
849+
EOS
850+
pp_invalid = <<-EOS
851+
docker::run { '#{default_image}':
852+
image => '#{default_image}:#{default_image_tag}',
853+
verify_digest => 'sha256:90659bf80b44ce6be8234e6ff90a1ac34acbeb826903b02cfa0da11c82cbc000',
854+
}
855+
EOS
856+
857+
apply_manifest(pp, catch_failures: true)
858+
run_shell('/usr/local/bin/docker-run-alpine-start.sh', expect_failures: false) do |r|
859+
expect(r.stdout.include?('Digest verify failed!')).to be false
860+
end
861+
862+
apply_manifest(pp_invalid, catch_failures: true)
863+
run_shell('/usr/local/bin/docker-run-alpine-start.sh', expect_failures: true) do |r|
864+
expect(r.stdout.include?('Digest verify failed!')).to be true
865+
end
866+
end
838867
end
839868

840869
describe 'docker::exec', win_broken: true do
@@ -966,41 +995,4 @@ class { 'docker': #{docker_args} }
966995
apply_manifest(pp_delete, catch_failures: true)
967996
end
968997
end
969-
970-
context 'When verify_digest is set', win_broken: true do
971-
let(:pp_valid_digest) do
972-
"
973-
class { 'docker': #{docker_args} }
974-
docker::image { '#{default_image}:#{default_image_tag}':
975-
require => Class['docker'],
976-
}
977-
docker::run { '#{default_image}':
978-
image => '#{default_image}:#{default_image_tag}',
979-
verify_digest => '#{default_local_digest}',
980-
}
981-
"
982-
end
983-
let(:pp_invalid_digest) do
984-
"
985-
docker::run { '#{default_image}':
986-
image => '#{default_image}:#{default_image_tag}',
987-
verify_digest => 'sha256:90659bf80b44ce6be8234e6ff90a1ac34acbeb826903b02cfa0da11c82cbc000',
988-
}
989-
"
990-
end
991-
992-
it 'run with valid verify_digest' do
993-
apply_manifest(pp_valid_digest, catch_failures: true)
994-
run_shell('/usr/local/bin/docker-run-alpine-start.sh', expect_failures: false) do |r|
995-
expect(r.stdout.include?('Digest verify failed!')).to be false
996-
end
997-
end
998-
999-
it 'run with invalid verify_digest' do
1000-
apply_manifest(pp_invalid_digest, catch_failures: true)
1001-
run_shell('/usr/local/bin/docker-run-alpine-start.sh', expect_failures: true) do |r|
1002-
expect(r.stdout.include?('Digest verify failed!')).to be true
1003-
end
1004-
end
1005-
end
1006998
end

0 commit comments

Comments
 (0)