From 72df6f3c6dbe992b60ffcb15ccb0c720ee1f7b0a Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Wed, 14 Oct 2015 20:05:24 +0100 Subject: [PATCH] (MODULES-2655) Fix acceptance testing for SSLProtocol behaviour for real --- spec/acceptance/vhost_spec.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb index 6ca7c350e..e903b38d8 100644 --- a/spec/acceptance/vhost_spec.rb +++ b/spec/acceptance/vhost_spec.rb @@ -1345,11 +1345,13 @@ class { 'apache': } pp = <<-EOS class { 'apache': } apache::vhost { 'test.server': - docroot => '/tmp', + docroot => '/tmp', + ssl => true, ssl_protocol => ['All', '-SSLv2'], } apache::vhost { 'test2.server': - docroot => '/tmp', + docroot => '/tmp', + ssl => true, ssl_protocol => 'All -SSLv2', } EOS @@ -1358,12 +1360,12 @@ class { 'apache': } describe file("#{$vhost_dir}/25-test.server.conf") do it { is_expected.to be_file } - it { is_expected.to contain 'SSLProtocol All -SSLv2' } + it { is_expected.to contain 'SSLProtocol *All -SSLv2' } end describe file("#{$vhost_dir}/25-test2.server.conf") do it { is_expected.to be_file } - it { is_expected.to contain 'SSLProtocol All -SSLv2' } + it { is_expected.to contain 'SSLProtocol *All -SSLv2' } end end end