Merge branch 'test-fixups'

sous-chefs · Jan 22, 2017 · 4f64e2c · 4f64e2c
2 parents 8e0f760 + 31126d9
commit 4f64e2c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml
@@ -4,6 +4,8 @@ driver:
   memory: '512m'
   cpu: 2
   use_sudo: false
+  privileged: <%= ENV['TRAVIS'] ? false : true %>
+  add_host: <%= ENV['TRAVIS'] ? [] : [['localhost.localdomain', '127.0.0.1']] %>
 provisioner:
   name: 'chef_solo'
   require_chef_omnibus: false

diff --git a/Berksfile b/Berksfile
@@ -3,6 +3,6 @@ source 'https://api.berkshelf.com'
 metadata
 
 group :test do
-  cookbook 'apt'
-  cookbook 'java'
+  cookbook 'java', '~> 1.22.0'
+  cookbook 'apt', '< 4.0'
 end
diff --git a/test/integration/helpers/serverspec/support/service_common.rb b/test/integration/helpers/serverspec/support/service_common.rb
@@ -54,7 +54,7 @@
   def start_kafka(wait = false)
     result = run_command(start_command_string)
     if wait && result.exit_status.zero?
-      await(10) do
+      await do
         File.exist?(log_file_path) && File.read(log_file_path).match(start_regexp)
       end
     end
@@ -64,7 +64,7 @@ def start_kafka(wait = false)
   def stop_kafka(wait = false)
     result = run_command(stop_command_string)
     if wait && result.exit_status.zero?
-      await(10) { File.exist?(log_file_path) && File.read(log_file_path).match(stop_regexp) }
+      await { File.exist?(log_file_path) && File.read(log_file_path).match(stop_regexp) }
     end
     result
   end