Skip to content

Commit

Permalink
Merge pull request #302 from HelenCampbell/debiantestupdate
Browse files Browse the repository at this point in the history
Adding bug workaround in tests for Debian 8
  • Loading branch information
DavidS committed Dec 9, 2015
2 parents fab104f + 690cb20 commit d92334e
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions spec/acceptance/ntp_service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
describe service(servicename) do
if !(fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12')
it { should be_running }
it { should be_enabled }
if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
pending 'Should be enabled - Bug 760616 on Debian 8'
else
it { should be_enabled }
end
else
# hack until we either update SpecInfra or come up with alternative
it {
Expand Down Expand Up @@ -73,7 +77,11 @@ class { 'ntp':
describe service(servicename) do
if !(fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12')
it { should be_running }
it { should be_enabled }
if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')
pending 'Should be enabled - Bug 760616 on Debian 8'
else
it { should be_enabled }
end
else
# hack until we either update SpecInfra or come up with alternative
output = shell('service ntpd status', :acceptable_exit_codes => [0, 3])
Expand Down

0 comments on commit d92334e

Please sign in to comment.