Mostly small changes toward 0.20.1

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

1 files changed, 8 insertions, 3 deletions

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