Skip to content

Commit

Permalink
Merge pull request redhat-openstack#245 from hunner/fix_augeas
Browse files Browse the repository at this point in the history
Fix the validate_augeas beaker tests
  • Loading branch information
hunner committed May 2, 2014
2 parents 143a007 + af49ef4 commit 7443e8b
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 41 deletions.
101 changes: 62 additions & 39 deletions spec/acceptance/validate_augeas_spec.rb
Original file line number Diff line number Diff line change
@@ -1,39 +1,62 @@
#require 'spec_helper_acceptance'
#
#describe 'validate_augeas function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
# describe 'prep' do
# it 'installs augeas for tests'
# end
# describe 'success' do
# it 'validates a single argument' do
# pp = <<-EOS
# $one = { 'a' => 1 }
# validate_hash($one)
# EOS
#
# apply_manifest(pp, :catch_failures => true)
# end
# it 'validates an multiple arguments' do
# pp = <<-EOS
# $one = { 'a' => 1 }
# $two = { 'b' => 2 }
# validate_hash($one,$two)
# EOS
#
# apply_manifest(pp, :catch_failures => true)
# end
# it 'validates a non-hash' do
# {
# %{validate_hash('{ "not" => "hash" }')} => "String",
# %{validate_hash('string')} => "String",
# %{validate_hash(["array"])} => "Array",
# %{validate_hash(undef)} => "String",
# }.each do |pp,type|
# expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/a #{type}/)
# end
# end
# end
# describe 'failure' do
# it 'handles improper number of arguments'
# end
#end
require 'spec_helper_acceptance'

describe 'validate_augeas function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
describe 'prep' do
it 'installs augeas for tests'
end
describe 'success' do
context 'valid inputs with no 3rd argument' do
{
'root:x:0:0:root:/root:/bin/bash\n' => 'Passwd.lns',
'proc /proc proc nodev,noexec,nosuid 0 0\n' => 'Fstab.lns'
}.each do |line,lens|
it "validates a single argument for #{lens}" do
pp = <<-EOS
$line = "#{line}"
$lens = "#{lens}"
validate_augeas($line, $lens)
EOS

apply_manifest(pp, :catch_failures => true)
end
end
end
context 'valid inputs with 3rd and 4th arguments' do
it "validates a restricted value" do
line = 'root:x:0:0:root:/root:/bin/barsh\n'
lens = 'Passwd.lns'
restriction = '$file/*[shell="/bin/barsh"]'
pp = <<-EOS
$line = "#{line}"
$lens = "#{lens}"
$restriction = ['#{restriction}']
validate_augeas($line, $lens, $restriction, "my custom failure message")
EOS

expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/my custom failure message/)
end
end
context 'invalid inputs' do
{
'root:x:0:0:root' => 'Passwd.lns',
'127.0.1.1' => 'Hosts.lns'
}.each do |line,lens|
it "validates a single argument for #{lens}" do
pp = <<-EOS
$line = "#{line}"
$lens = "#{lens}"
validate_augeas($line, $lens)
EOS

apply_manifest(pp, :expect_failures => true)
end
end
end
context 'garbage inputs' do
it 'raises an error on invalid inputs'
end
end
describe 'failure' do
it 'handles improper number of arguments'
end
end
3 changes: 1 addition & 2 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
if host.is_pe?
install_pe
else
install_package host, 'rubygems'
on host, 'gem install puppet --no-ri --no-rdoc'
install_puppet
on host, "mkdir -p #{host['distmoduledir']}"
end
end
Expand Down

0 comments on commit 7443e8b

Please sign in to comment.