Converting transport format to YAML instead of Marshal, and caching the file in a YAML format, also. This required a significant rework of both Transportable classes. Lastly, I am also now caching the list of classes in a class file in /etc/puppet.

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

1 files changed, 3 insertions, 5 deletions

diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb
index 389141ed0..e1f48c11b 100755
--- a/test/executables/puppetmasterd.rb
+++ b/test/executables/puppetmasterd.rb
@@ -80,8 +80,6 @@ class TestPuppetMasterD < Test::Unit::TestCase
         }
 
         objects = nil
-        assert_instance_of(Puppet::TransBucket, retval,
-            "Retrieved non-transportable object")
         stopmasterd
         sleep(1)
     end
@@ -135,16 +133,16 @@ class TestPuppetMasterD < Test::Unit::TestCase
         Facter.each { |p,v|
             facts[p] = v
         }
-        textfacts = CGI.escape(Marshal::dump(facts))
+        textfacts = CGI.escape(YAML.dump(facts))
         assert_nothing_raised() {
             #Puppet.notice "calling status"
             #retval = client.call("status.status", "")
-            retval = client.call("puppetmaster.getconfig", textfacts)
+            retval = client.call("puppetmaster.getconfig", textfacts, "yaml")
         }
 
         objects = nil
         assert_nothing_raised {
-            Marshal::load(CGI.unescape(retval))
+            YAML.load(CGI.unescape(retval))
         }
         #stopmasterd
     end