From bc136efb1e7f22b823d0da94e99263d198529e2b Mon Sep 17 00:00:00 2001 From: Bryan Jen Date: Wed, 22 Apr 2015 08:27:09 -0700 Subject: [PATCH] fixes debian-based flakiness in acceptance tests --- spec/spec_helper_acceptance.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 6b6f1b8fa..38fe316d7 100644 --- 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