diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb index 88879cd1..d867c0cd 100644 --- a/spec/acceptance/basic_spec.rb +++ b/spec/acceptance/basic_spec.rb @@ -84,7 +84,7 @@ class { 'haproxy': } describe 'dependency requirements' do # C9712 describe 'without concat' do - before :all do shell("mv #{hosts.first[:distmoduledir]}/concat /tmp") end + before :all do shell("mv $(puppet apply --color=false -e 'notice(get_module_path(\"concat\"))'|grep concat|cut -d ' ' -f 3) /tmp") end after :all do shell("mv /tmp/concat #{hosts.first[:distmoduledir]}") end it 'should fail' do apply_manifest(%{class { 'haproxy': }}, :expect_failures => true) @@ -92,7 +92,7 @@ class { 'haproxy': } end # C9712 describe 'without stdlib' do - before :all do shell("mv #{hosts.first[:distmoduledir]}/stdlib /tmp") end + before :all do shell("mv $(puppet apply --color=false -e 'notice(get_module_path(\"stdlib\"))'|grep stdlib|cut -d ' ' -f 3) /tmp") end after :all do shell("mv /tmp/stdlib #{hosts.first[:distmoduledir]}") end it 'should fail' do apply_manifest(%{class { 'haproxy': }}, :expect_failures => true) diff --git a/spec/acceptance/listen_spec.rb b/spec/acceptance/listen_spec.rb index f5b72c40..3ff81e15 100644 --- a/spec/acceptance/listen_spec.rb +++ b/spec/acceptance/listen_spec.rb @@ -37,11 +37,12 @@ class { 'haproxy': } ipaddress => $::ipaddress_lo, ports => '5555', mode => 'http', + options => { 'option' => 'httpchk', }, } haproxy::balancermember { 'port 5556': listening_service => 'app00', ports => '5556', - options => ['check','downinter 500'], + options => 'check', } haproxy::balancermember { 'port 5557': listening_service => 'app00',