Almost all tests now pass. I have basically reached the point where I was before I integrated graphing, except that all of the relationship handling is now inside the transaction, and any kind of recursion (including file) is *tons* easier to model and manage.

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

1 files changed, 3 insertions, 8 deletions

diff --git a/test/server/pelement.rb b/test/server/pelement.rb
index 24836e66c..c86dadc11 100755
--- a/test/server/pelement.rb
+++ b/test/server/pelement.rb
@@ -254,23 +254,16 @@ class TestPElementServer < Test::Unit::TestCase
 
         Puppet::Type.type(:file).clear
 
-        Puppet.err filetrans[:parent].inspect
-
-        #p filetrans
-
         bucket = Puppet::TransBucket.new
         bucket.type = "file"
         bucket.push filetrans
 
-        #p bucket
-
         oldbucket = bucket.dup
         File.unlink(file)
         assert_nothing_raised {
             server.apply(bucket)
         }
 
-
         assert(FileTest.exists?(file), "File did not get recreated")
 
         # Now try it as a "nonlocal" server
@@ -287,11 +280,13 @@ class TestPElementServer < Test::Unit::TestCase
             Puppet.warning "YAML is broken on this machine"
             return
         end
-        #puts Base64.decode64(yaml)
+        # puts Base64.decode64(yaml)
+        objects = nil
         assert_nothing_raised("Could not reload yaml") {
             YAML::load(Base64.decode64(yaml))
         }
 
+        # The server is supposed to accept yaml and execute it.
         assert_nothing_raised {
             server.apply(yaml)
         }