From 6924a96e20e2cdba4bc4dda312bd917249b8ac67 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 15 Jul 2015 10:06:16 -0700 Subject: [PATCH 1/2] make datacenter name test case-insensitive. Consul now down-cases dc names. --- test/integration/default/serverspec/localhost/consul_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/default/serverspec/localhost/consul_spec.rb b/test/integration/default/serverspec/localhost/consul_spec.rb index 3028e541..75161787 100644 --- a/test/integration/default/serverspec/localhost/consul_spec.rb +++ b/test/integration/default/serverspec/localhost/consul_spec.rb @@ -33,7 +33,7 @@ describe 'config file attributes' do context command 'consul members -detailed' do - its(:stdout) { should match %r{\bdc=FortMeade\b} } + its(:stdout) { should match %r{\bdc=FortMeade\b}i } end end From 4ca91a1db8dc521a7f28f37524e869b7ad225777 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 15 Jul 2015 10:07:01 -0700 Subject: [PATCH 2/2] added `set :backend, :exec` to default and packages serverspec tests to prevent warnings --- test/integration/default/serverspec/spec_helper.rb | 2 ++ test/integration/packages/serverspec/spec_helper.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/test/integration/default/serverspec/spec_helper.rb b/test/integration/default/serverspec/spec_helper.rb index f94e0e67..c0925118 100644 --- a/test/integration/default/serverspec/spec_helper.rb +++ b/test/integration/default/serverspec/spec_helper.rb @@ -1,5 +1,7 @@ require 'serverspec' +set :backend, :exec + RSpec.configure do |c| c.path = '/usr/local/bin:/sbin:/bin:/usr/bin' end diff --git a/test/integration/packages/serverspec/spec_helper.rb b/test/integration/packages/serverspec/spec_helper.rb index f94e0e67..c0925118 100644 --- a/test/integration/packages/serverspec/spec_helper.rb +++ b/test/integration/packages/serverspec/spec_helper.rb @@ -1,5 +1,7 @@ require 'serverspec' +set :backend, :exec + RSpec.configure do |c| c.path = '/usr/local/bin:/sbin:/bin:/usr/bin' end