Merge branch 'CHEF-1864' into pl-master

Author: sdelano

features/steps/packages.rb

@@ -27,13 +27,20 @@ def remove_integration_test_apt_source
 
 After("@apt")do
 remove_integration_test_apt_source
+purge_chef_integration_debs
+shell_out!"apt-get clean"
+end
+
+Before('@dpkg')do
+purge_chef_integration_debs
 end
 
-Before('@dpkg,@apt')do
+Before('@apt')do
 purge_chef_integration_debs
+shell_out!"apt-get clean"
 end
 
-After('@dpkg,@apt')do
+After('@dpkg')do
 purge_chef_integration_debs
 end
 
@@ -64,6 +71,13 @@ def remove_integration_test_apt_source
 
 apt_server.start
 end
+
+Chef::Log.debug"Waiting for apt server to start"
+untiltcp_test_port("localhost",9000)do
+Chef::Log.debug"."
+sleep1
+end
+Chef::Log.debug"done"
 end
 
 Given"I have updated my apt cache"do
@@ -119,3 +133,13 @@ def dpkg_should_be_installed(pkg_name)
 dpkg_should_be_installed(package_name)
 end
 
+deftcp_test_port(hostname,port)
+tcp_socket=TCPSocket.new(hostname,port)
+true
+rescueErrno::ETIMEDOUT
+false
+rescueErrno::ECONNREFUSED
+false
+ensure
+tcp_socket && tcp_socket.close
+end