Skip to content

Commit

Permalink
Merge pull request voxpupuli#215 from 3flex/fix-broken-test
Browse files Browse the repository at this point in the history
Update tests broken by merging voxpupuli#203
  • Loading branch information
James Fryman committed Dec 30, 2013
2 parents 96a0fd9 + 539a524 commit ec4f4a0
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions spec/defines/resource_vhost_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -309,37 +309,37 @@
:title => 'should enable IPv6',
:attr => 'ipv6_enable',
:value => 'true',
:match => ' listen [::]:80 default ipv6only=on;',
:match => ' listen [::]:443 ssl default ipv6only=on;',
},
{
:title => 'should enable IPv6',
:attr => 'ipv6_enable',
:value => true,
:match => ' listen [::]:80 default ipv6only=on;',
:match => ' listen [::]:443 ssl default ipv6only=on;',
},
{
:title => 'should disable IPv6',
:attr => 'ipv6_enable',
:value => false,
:notmatch => / listen \[::\]:80 default ipv6only=on;/,
:notmatch => / listen \[::\]:443 ssl default ipv6only=on;/,
},
{
:title => 'should set the IPv6 listen IP',
:attr => 'ipv6_listen_ip',
:value => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
:match => ' listen [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80 default ipv6only=on;',
:match => ' listen [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:443 ssl default ipv6only=on;',
},
{
:title => 'should set the IPv6 listen port',
:attr => 'ipv6_listen_port',
:attr => 'ssl_port',
:value => '45',
:match => ' listen [::]:45 default ipv6only=on;',
:match => ' listen [::]:45 ssl default ipv6only=on;',
},
{
:title => 'should set the IPv6 listen options',
:attr => 'ipv6_listen_options',
:value => 'spdy default',
:match => ' listen [::]:80 spdy default ipv6only=on;',
:match => ' listen [::]:443 ssl spdy default ipv6only=on;',
},
{
:title => 'should set servername(s)',
Expand Down

0 comments on commit ec4f4a0

Please sign in to comment.