Merge pull request redhat-openstack#261 from bmjen/fix-acceptance-tests

fixes debian-based flakiness in acceptance tests
xbezdick · Apr 22, 2015 · 94ccfd2 · 94ccfd2
2 parents 060c453 + bc136ef
commit 94ccfd2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -24,6 +24,11 @@
     else
       on host, puppet('module install puppetlabs-stdlib'), {:acceptable_exit_codes => [0, 1]}
     end
+
+    if fact('osfamily') == 'Debian'
+      shell('[[ -f /etc/dhcp/dhclient-exit-hooks.d/ntp ]] && rm /etc/dhcp/dhcp-exit-hooks.d/ntp', { :acceptable_exit_codes => [0, 1] })
+      shell('[[ -f /etc/dhcp3/dhclient-exit-hooks.d/ntp ]] && rm /etc/dhcp3/dhcp-exit-hooks.d/ntp', { :acceptable_exit_codes => [0, 1] })
+    end
   end
 end