From 64a3392c7ca172e400ba36c43724b3fbf5f75b4c Mon Sep 17 00:00:00 2001 From: luke Date: Thu, 21 Sep 2006 21:28:39 +0000 Subject: Small test fixes in preparation for 0.19.2 git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1653 980ebf18-57e1-0310-9a29-db15c13687c0 --- test/server/report.rb | 2 +- test/types/package.rb | 7 ++----- 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 -- cgit