From 2d923de19fc5cb87885184be27e736aa9b54413b Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 3 Feb 2014 13:11:47 +0100 Subject: [PATCH] Update tests accroding to changed templates Specs no longer require `ipv6only=on` in listen option when using user supplied value since it is no longer hardcoded in the template. --- spec/defines/resource_mailhost_spec.rb | 4 ++-- spec/defines/resource_vhost_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/defines/resource_mailhost_spec.rb b/spec/defines/resource_mailhost_spec.rb index 9f5de6f06..e59adfdab 100644 --- a/spec/defines/resource_mailhost_spec.rb +++ b/spec/defines/resource_mailhost_spec.rb @@ -85,7 +85,7 @@ :title => 'should set the IPv6 listen options', :attr => 'ipv6_listen_options', :value => 'spdy', - :match => ' listen [::]:80 spdy ipv6only=on;', + :match => ' listen [::]:80 spdy;', }, { :title => 'should set servername(s)', @@ -241,7 +241,7 @@ :title => 'should set the IPv6 listen options', :attr => 'ipv6_listen_options', :value => 'spdy', - :match => ' listen [::]:80 spdy ipv6only=on;', + :match => ' listen [::]:80 spdy;', }, { :title => 'should set servername(s)', diff --git a/spec/defines/resource_vhost_spec.rb b/spec/defines/resource_vhost_spec.rb index 573953dc8..fe1d564c2 100644 --- a/spec/defines/resource_vhost_spec.rb +++ b/spec/defines/resource_vhost_spec.rb @@ -95,7 +95,7 @@ :title => 'should set the IPv6 listen options', :attr => 'ipv6_listen_options', :value => 'spdy', - :match => ' listen [::]:80 spdy ipv6only=on;', + :match => ' listen [::]:80 spdy;', }, { :title => 'should set servername(s)', @@ -321,7 +321,7 @@ :title => 'should set the IPv6 listen options', :attr => 'ipv6_listen_options', :value => 'spdy default', - :match => ' listen [::]:443 ssl spdy default ipv6only=on;', + :match => ' listen [::]:443 ssl spdy default;', }, { :title => 'should set servername(s)',