Upgrade to latest serverspec/specinfra

2015-06-23 11:30:55 +01:00
parent d13ea38c2f
commit ea6441eb57
8 changed files with 14 additions and 24 deletions
--- a/test/integration/aliases/serverspec/aliases_spec.rb
+++ b/test/integration/aliases/serverspec/aliases_spec.rb
@@ -14,7 +14,7 @@
 # limitations under the License.
 #

-require_relative '../../../kitchen/data/spec_helper'
+require_relative './spec_helper'

 describe 'postfix::aliases' do
  context 'configures' do
--- a/test/integration/client/serverspec/client_spec.rb
+++ b/test/integration/client/serverspec/client_spec.rb
@@ -14,7 +14,7 @@
 # limitations under the License.
 #

-require_relative '../../../kitchen/data/spec_helper'
+require_relative './spec_helper'

 describe 'postfix::client' do
  it 'doesnt configure postfix because solo is unsupported' do
--- a/test/integration/default/serverspec/default_spec.rb
+++ b/test/integration/default/serverspec/default_spec.rb
@@ -14,7 +14,7 @@
 # limitations under the License.
 #

-require_relative '../../../kitchen/data/spec_helper'
+require_relative './spec_helper'

 describe 'postfix::default' do
  describe package('postfix') do
--- a/test/integration/helpers/serverspec/spec_helper.rb
+++ b/test/integration/helpers/serverspec/spec_helper.rb
@@ -0,0 +1,3 @@
+require 'serverspec'
+
+set :backend, :exec
--- a/test/integration/sasl_auth/serverspec/sasl_auth_spec.rb
+++ b/test/integration/sasl_auth/serverspec/sasl_auth_spec.rb
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require_relative '../../../kitchen/data/spec_helper'
+require_relative './spec_helper'

 describe 'postfix::sasl_auth' do
  let(:sasl_passwd_file) { '/etc/postfix/sasl_passwd' }
--- a/test/integration/server/serverspec/server_spec.rb
+++ b/test/integration/server/serverspec/server_spec.rb
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require_relative '../../../kitchen/data/spec_helper'
+require_relative './spec_helper'

 describe 'postfix::server' do
  it 'doesnt configure postfix because solo is unsupported' do