summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtest/server/report.rb2
-rw-r--r--test/types/package.rb7
2 files changed, 3 insertions, 6 deletions
diff --git a/test/server/report.rb b/test/server/report.rb
index 423b8ce90..69ade8526 100755
--- a/test/server/report.rb
+++ b/test/server/report.rb
@@ -59,7 +59,7 @@ class TestReportServer < Test::Unit::TestCase
# Make sure our report is valid and stuff.
report.logs.zip(newreport.logs).each do |ol,nl|
%w{level message time tags source}.each do |method|
- assert_equal(ol.send(method), nl.send(method),
+ assert_equal(ol.send(method).to_s, nl.send(method).to_s,
"%s got changed" % method)
end
end
diff --git a/test/types/package.rb b/test/types/package.rb
index 4d04dc147..38bb3b08d 100644
--- a/test/types/package.rb
+++ b/test/types/package.rb
@@ -430,18 +430,15 @@ class TestPackages < Test::Unit::TestCase
else
$stderr.puts "Install gems for gem tests"
- def test_nogems_nofailures
+ def test_failure_when_no_gems
obj = nil
- assert_nothing_raised do
+ assert_raise(ArgumentError) do
Puppet::Type.newpackage(
:name => "yayness",
:provider => "gem",
:ensure => "installed"
)
end
-
- assert_nil(Puppet::Type.type(:package)["yayness"],
- "Invalid gem package got created")
end
end
end