Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't require empty output from augparse #12

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

gem 'puppetlabs_spec_helper'
gem 'rspec-puppet', '< 1.0.0'
gem 'rspec-puppet'
gem 'ruby-augeas'

group :test do
Expand Down
1 change: 1 addition & 0 deletions lib/rspec-puppet-augeas/matchers/execute.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ def initialize

def matches?(resource)
@resource = resource
RSpec::Puppet::Coverage.cover!(resource)
return false if resource.txn.any_failed?
return false if change and !resource.txn.changed?.any?
return false if idempotent and resource.idempotent.changed?.any?
Expand Down
2 changes: 1 addition & 1 deletion lib/rspec-puppet-augeas/test_utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ module Test_Rspec_Puppet_Augeas =
end

output = %x(augparse --notypecheck #{testaug} 2>&1)
raise RSpec::Puppet::Augeas::Error, "augparse failed:\n#{output}" unless $? == 0 && output.empty?
raise RSpec::Puppet::Augeas::Error, "augparse failed:\n#{output}" unless $? == 0
end
end

Expand Down
1 change: 0 additions & 1 deletion rspec-puppet-augeas.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Gem::Specification.new do |s|
'spec/spec_helper.rb'
]

s.add_dependency 'rspec-puppet', '< 1.0.0'
s.add_dependency 'puppetlabs_spec_helper'

s.authors = ['Dominic Cleal']
Expand Down