Mostly small changes toward 0.20.1

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1852 980ebf18-57e1-0310-9a29-db15c13687c0

4 files changed, 11 insertions, 10 deletions

diff --git a/lib/puppet.rb b/lib/puppet.rb
index e10cc6489..d621edb93 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -19,7 +19,7 @@ require 'puppet/suidmanager'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-    PUPPETVERSION = '0.20.0svn'
+    PUPPETVERSION = '0.20.0'
 
     def Puppet.version
         return PUPPETVERSION
diff --git a/test/certmgr/certmgr.rb b/test/certmgr/certmgr.rb
index d9349a9c0..32934e8ce 100755
--- a/test/certmgr/certmgr.rb
+++ b/test/certmgr/certmgr.rb
@@ -255,13 +255,12 @@ class TestCertMgr < Test::Unit::TestCase
         ca.revoke(h2.serial)
         assert_equal(1, ca.crl.extensions.size)
 
-        File::open("/tmp/crl.pem", "w") { |f| f.write(ca.crl.to_pem) }
         # Recreate the CA from disk
         ca = mkCA()
         store = mkStore(ca)
         assert( store.verify(ca.cert))
-        assert(!store.verify(h1, [ca.cert]))
-        assert(!store.verify(h2, [ca.cert]))
+        assert(!store.verify(h1, [ca.cert]), "revoked cert passed")
+        assert(!store.verify(h2, [ca.cert]), "revoked cert passed")
     end
 
     def test_ttl
diff --git a/test/language/parser.rb b/test/language/parser.rb
index fa87dc6f5..fe45d5adb 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -438,14 +438,19 @@ file { "/tmp/yayness":
             end
 
             check = proc do |res|
+                if res.is_a?(Puppet::Parser::Resource)
+                    txt = res.ref
+                else
+                    txt = res.class
+                end
                 # Real resources get marked virtual when exported
                 if form == :virtual or res.is_a?(Puppet::Parser::Resource)
-                    assert(res.virtual, "Resource #{res.class} is not virtual")
+                    assert(res.virtual, "Resource #{txt} is not virtual")
                 end
                 if form == :virtual
-                    assert(! res.exported, "Resource #{res.type} is exported")
+                    assert(! res.exported, "Resource #{txt} is exported")
                 else
-                    assert(res.exported, "Resource #{res.type} is not exported")
+                    assert(res.exported, "Resource #{txt} is not exported")
                 end
             end
 
diff --git a/test/other/config.rb b/test/other/config.rb
index 1ce82c19d..195157285 100755
--- a/test/other/config.rb
+++ b/test/other/config.rb
@@ -874,9 +874,6 @@ inttest = 27
         config[:mkusers] = true
 
         comp = config.to_component
-        comp.each do |c|
-            puts c.ref
-        end
 
         Puppet::Type.type(:user).each do |u|
             assert(u.name != "root", "Tried to manage root user")