summaryrefslogtreecommitdiffstats
path: root/test/providers
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-05 18:26:12 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-05 18:26:12 +0000
commitd0ecc0e45cc5ff0cd5235e6ab9bcd031030973c2 (patch)
treed1c442139297a2afe4040cb953de406cb6bec01e /test/providers
parent2728f500c62118a19b5f93640747cbfdbd97a9bd (diff)
Messing around a bit with how tests work
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2054 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/providers')
-rwxr-xr-xtest/providers/mount/parsed.rb2
-rwxr-xr-xtest/providers/parsedsshkey.rb4
2 files changed, 2 insertions, 4 deletions
diff --git a/test/providers/mount/parsed.rb b/test/providers/mount/parsed.rb
index e4450ee0e..8c60c9626 100755
--- a/test/providers/mount/parsed.rb
+++ b/test/providers/mount/parsed.rb
@@ -139,7 +139,7 @@ class TestParsedMounts < Test::Unit::TestCase
end
assert_equal(:present, provider.state_hash[:ensure],
- "Could not find root fs")
+ "Could not find root fs with provider %s" % provider.name)
assert_nothing_raised {
assert(provider.mounted?, "Root is considered not mounted")
diff --git a/test/providers/parsedsshkey.rb b/test/providers/parsedsshkey.rb
index 9fc52e643..edda8317f 100755
--- a/test/providers/parsedsshkey.rb
+++ b/test/providers/parsedsshkey.rb
@@ -26,8 +26,6 @@ class TestParsedSSHKey < Test::Unit::TestCase
end
def mkkey(name = "host.domain.com")
- mount = nil
-
if defined? @pcount
@pcount += 1
else
@@ -41,7 +39,7 @@ class TestParsedSSHKey < Test::Unit::TestCase
:ensure => :present
}
- fakemodel = fakemodel(:mount, args[:name])
+ fakemodel = fakemodel(:sshkey, args[:name])
key = @provider.new(fakemodel)
args.each do |p,v|