Fixes for Travis CI

test/fixtures/cookbooks/wrapper/attributes/default.rb

@@ -1,6 +1,8 @@
-
-default['postfix']['main']['smtp_sasl_auth_enable'] = 'yes'
-
-default['postfix']['main']['relayhost'] = 'please'
-default['postfix']['sasl']['smtp_sasl_user_name'] = 'keep'
-default['postfix']['sasl']['smtp_sasl_passwd'] = 'us'
+
+default['postfix']['main']['smtp_sasl_auth_enable'] = 'yes'
+
+default['postfix']['main']['relayhost'] = 'please'
+default['postfix']['main']['smtp_sasl_security_options'] = 'keep'
+default['postfix']['sasl']['smtp_sasl_user_name'] = 'us'
+default['postfix']['sasl']['smtp_sasl_passwd'] = 'happy'
+default['postfix']['sender_canonical_map_entries'] = {}

test/fixtures/cookbooks/wrapper/metadata.rb

@@ -1,3 +1,4 @@
 name 'wrapper'
 version '0.0.1'
 description 'Wrapper cookbook, used for testing only.'
+depends 'postfix'

test/fixtures/cookbooks/wrapper/recipes/default.rb

@@ -1,2 +1,2 @@
 
-include 'postfix'
+include_recipe 'postfix'

test/integration/helpers/serverspec/spec_helper.rb

@@ -3,25 +3,24 @@ require 'serverspec'
 set :backend, :exec
 set :path, '/sbin:/usr/local/sbin:$PATH'
 
-def get_family
+def which_family
   fam = 'solaris2'
   return fam unless File.exist? '/etc/release'
-  File.open("/etc/release") do |file|
-      while line = file.gets
-        case line
-        when /^\s*(OmniOS)/
-          fam = 'omnios'
-        end
+  File.open('/etc/release') do |file|
+    while (line = file.gets)
+      case line
+      when /^\s*(OmniOS)/
+        fam = 'omnios'
       end
+    end
   end
   fam
 end
 
 def postfix_conf_path
-  if os[:family] == 'solaris' && get_family == 'omnios'
+  if os[:family] == 'solaris' && which_family == 'omnios'
     '/opt/omni/etc/postfix/'
   else
     '/etc/postfix'
   end
 end
-