summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rwxr-xr-xtest/ral/providers/group.rb4
-rwxr-xr-xtest/ral/providers/user.rb4
-rwxr-xr-xtest/ral/type/filesources.rb4
3 files changed, 3 insertions, 9 deletions
diff --git a/test/ral/providers/group.rb b/test/ral/providers/group.rb
index 48120f332..ceba65ac4 100755
--- a/test/ral/providers/group.rb
+++ b/test/ral/providers/group.rb
@@ -71,12 +71,10 @@ class TestGroupProvider < Test::Unit::TestCase
end
else
def missing?(group)
- begin
obj = Etc.getgrnam(group)
return false
- rescue ArgumentError
+ rescue ArgumentError
return true
- end
end
def gid(name)
diff --git a/test/ral/providers/user.rb b/test/ral/providers/user.rb
index 033632894..7769e3a26 100755
--- a/test/ral/providers/user.rb
+++ b/test/ral/providers/user.rb
@@ -65,12 +65,10 @@ class TestUserProvider < Test::Unit::TestCase
end
else
def missing?(user)
- begin
obj = Etc.getpwnam(user)
return false
- rescue ArgumentError
+ rescue ArgumentError
return true
- end
end
def current?(param, user)
diff --git a/test/ral/type/filesources.rb b/test/ral/type/filesources.rb
index d3eb537c1..2b43424ac 100755
--- a/test/ral/type/filesources.rb
+++ b/test/ral/type/filesources.rb
@@ -30,11 +30,9 @@ class TestFileSources < Test::Unit::TestCase
end
def use_storage
- begin
initstorage
- rescue
+ rescue
system("rm -rf #{Puppet[:statefile]}")
- end
end
def initstorage