From 7ba8f5c287476cbd3e3fc51db2eebabda27380c7 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Wed, 2 Jun 2010 11:46:22 -0500 Subject: rest of the tests that I moved. --- tests/default.pp | 6 ------ tests/sudo-bad.pp | 15 --------------- tests/sudoers-break-test.pp | 5 ----- tests/sudoers-defined.pp | 19 +++++++++---------- tests/sudoers-delete.pp | 21 --------------------- tests/sudoers-distinct.pp | 6 +++--- tests/sudoers.pp | 27 --------------------------- tests/test-alias-user.pp | 11 ----------- tests/test2.pp | 17 ----------------- 9 files changed, 12 insertions(+), 115 deletions(-) delete mode 100644 tests/default.pp delete mode 100644 tests/sudo-bad.pp delete mode 100644 tests/sudoers-break-test.pp delete mode 100644 tests/sudoers-delete.pp delete mode 100644 tests/sudoers.pp delete mode 100644 tests/test-alias-user.pp delete mode 100644 tests/test2.pp diff --git a/tests/default.pp b/tests/default.pp deleted file mode 100644 index 444e3bf..0000000 --- a/tests/default.pp +++ /dev/null @@ -1,6 +0,0 @@ -sudoers{'BLAHDDD': - # could be a user named defaults - users => ['dan', 'Defaults'], - hosts => 'ALL', - commands => '/bin/ls -la' -} diff --git a/tests/sudo-bad.pp b/tests/sudo-bad.pp deleted file mode 100644 index 5c0aebc..0000000 --- a/tests/sudo-bad.pp +++ /dev/null @@ -1,15 +0,0 @@ -sudoers{'BLAH': - #target => '/tmp/sudoers', - ensure => present, - sudo_alias => 'Cmnd_Alias', - items => ['/bin/blah', '/bin/blah4', '/bin/blah2'], - require => Sudoers['Defaults@host'] -} -sudoers{'Defaults@host': - parameters => ['x=y', 'one=1', 'two=2'], -} -sudoers{'TEST': - users => 'dan', - hosts => 'localhost', - commands => '/bin/true', -} diff --git a/tests/sudoers-break-test.pp b/tests/sudoers-break-test.pp deleted file mode 100644 index ca73c56..0000000 --- a/tests/sudoers-break-test.pp +++ /dev/null @@ -1,5 +0,0 @@ -sudoers{'blah4': - sudo_alias => 'Runas_Alias', - items => 'root', - commands => '/bin/true' -} diff --git a/tests/sudoers-defined.pp b/tests/sudoers-defined.pp index fa35b80..f3b698e 100644 --- a/tests/sudoers-defined.pp +++ b/tests/sudoers-defined.pp @@ -1,31 +1,30 @@ -resources{'sudoers': +resources { 'sudoers': purge => true, } -sudo::alias{'BLAH1': +sudo::alias { 'BLAH1': #target => '/tmp/sudoers', - ensure => absent, + ensure => present, sudo_alias => 'Cmnd_Alias', items => ['/bin/blah', '/bin/blah4', '/bin/blah2'], - require => Sudoers['BHAH2'] } -sudo::spec{'blah4': +sudo::spec { 'blah4': #target => '/tmp/sudoers', users => 'dan', hosts => 'localhost', commands => '/bin/true', } -sudo::alias{'BLAH3': +sudo::alias { 'BLAH3': sudo_alias => 'Cmnd_Alias', items => ['/bin/blah', '/bin/blah4', '/bin/blah2'], before => Sudoers['BHAH2'] } -sudo::alias{'BHAH2': +sudo::alias { 'BHAH2': #target => '/tmp/sudoers', - ensure => absent, + ensure => present, sudo_alias => 'Host_Alias', items => ['blah2', 'blah3', 'blah4', 'blah5'], - require => Sudoers['blah4'], + require => Sudo::spec['blah4'], } -sudo::defaults{'Defaults@host': +sudo::defaults { 'Defaults@host': parameters => ['x=y', 'one=1', 'two=2'], } diff --git a/tests/sudoers-delete.pp b/tests/sudoers-delete.pp deleted file mode 100644 index 3085a63..0000000 --- a/tests/sudoers-delete.pp +++ /dev/null @@ -1,21 +0,0 @@ -sudoers{'blah1': - target => '/tmp/sudoers', - ensure => absent, - alias => 'Cmnd_Alias', - items => ['blah4', 'blah2'], - linetype => 'alias', -} -#sudoers{'blah2': -# target => '/tmp/sudoers', -## ensure => present, -# alias => 'Host_Alias', -# items => ['blah2', 'blah3'], -# type => 'alias', -#} -##sudoers{'blah3': -# target => '/tmp/sudoers', -## ensure => present, -# users => 'dan', -# hosts => 'localhost', -# type => 'spec', -#} diff --git a/tests/sudoers-distinct.pp b/tests/sudoers-distinct.pp index 285082b..fcfed9f 100644 --- a/tests/sudoers-distinct.pp +++ b/tests/sudoers-distinct.pp @@ -6,7 +6,7 @@ sudo::alias{'BLAH1': #target => '/tmp/sudo', sudo_alias => 'Cmnd_Alias', items => ['/bin/blah', '/bin/blah4', '/bin/blah2'], -# require => sudoers['BHAH2'] + require => Sudo::alias['BHAH2'] } sudo::spec{'blah4': #target => '/tmp/sudoers', @@ -17,13 +17,13 @@ sudo::spec{'blah4': sudo::alias{'BLAH3': sudo_alias => 'Cmnd_Alias', items => ['/bin/blah', '/bin/blah4', '/bin/blah2'], - before => Sudoers['BHAH2'] + before => Sudo::alias['BHAH2'] } sudo::alias{'BHAH2': #target => '/tmp/sudoers', sudo_alias => 'Host_Alias', items => ['blah2', 'blah3', 'blah4', 'blah5'], -# require => Sudoers['blah4'], + require => Sudo::spec['blah4'], } sudo::defaults{'Defaults@host': parameters => ['x=y', 'one=1', 'two=2'], diff --git a/tests/sudoers.pp b/tests/sudoers.pp deleted file mode 100644 index 03f2069..0000000 --- a/tests/sudoers.pp +++ /dev/null @@ -1,27 +0,0 @@ -resources{'sudoers': - purge => true, -} -sudoers{'BLAH1': - #target => '/tmp/sudoers', - ensure => present, - sudo_alias => 'Cmnd_Alias', - items => ['/bin/blah', '/bin/blah4', '/bin/blah2'], - require => Sudoers['BHAH2'] -} -sudoers{'blah4': - #target => '/tmp/sudoers', - ensure => present, - users => 'dan', - hosts => 'localhost', - commands => '/bin/true', -} -sudoers{'BHAH2': - #target => '/tmp/sudoers', - ensure => present, - sudo_alias => 'Host_Alias', - items => ['blah2', 'blah3', 'blah4', 'blah5'], - require => Sudoers['blah4'], -} -sudoers{'Defaults@host': - parameters => ['x=y', 'one=1', 'two=2'], -} diff --git a/tests/test-alias-user.pp b/tests/test-alias-user.pp deleted file mode 100644 index a53c0b2..0000000 --- a/tests/test-alias-user.pp +++ /dev/null @@ -1,11 +0,0 @@ -#sudoers{'BLAH4': -# sudo_alias => 'Runas_Alias', -# items => 'root', -#} -sudoers{'BLAH4': - #target => '/tmp/sudoers', - ensure => present, - users => ['dan', 'dan4', 'dan3'], - hosts => ['localhost', 'localhost2'], - commands => ['/bin/true blah', '/bin/false de', '/bin/duder/dude blah'], -} diff --git a/tests/test2.pp b/tests/test2.pp deleted file mode 100644 index 549a3b4..0000000 --- a/tests/test2.pp +++ /dev/null @@ -1,17 +0,0 @@ -sudoers{'NAME': - ensure => present, - users => ['dan1', 'dan2'], - hosts => 'ALL', - commands => [ - '(root) /usr/bin/su - easapp', - '(easapp)/usr/local/eas-ts/bin/appctl', - ], -} -sudoers{'ALIAS_NAME': - ensure => present, - sudo_alias => 'Cmnd', - items => ['/bin/true', '/usr/bin/su - bob'], -} -sudoers{'Defaults@host': - parameters => ['x=y', 'one=1', 'two=2'], - } -- cgit v1.2.3