summaryrefslogtreecommitdiffstats
path: root/test/server
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-28 04:08:32 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-28 04:08:32 +0000
commit9539dbb5c8b54805a6c26f84f15abd6fdb5532b2 (patch)
tree8c5c508063b6159c0ac38072e2ef2180f5995967 /test/server
parent9b627cd0e061316feb73f332abb3c1e4e7aefe28 (diff)
Adding in all of the patches necessary to make a prototype rails interface to puppet nodes work. The biggest change is that there is now a separate NetworkClient class for every Client subclass, because otherwise you get namespace collisions. Most everything other change is a relatively minor patch.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1144 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/server')
-rw-r--r--test/server/pelement.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/server/pelement.rb b/test/server/pelement.rb
index 182a2db3b..13bd3657f 100644
--- a/test/server/pelement.rb
+++ b/test/server/pelement.rb
@@ -274,7 +274,7 @@ class TestPElementServer < Test::Unit::TestCase
server.local = false
yaml = nil
assert_nothing_raised {
- yaml = CGI.escape(YAML::dump(bucket))
+ yaml = Base64.encode64(YAML::dump(bucket))
}
Puppet::Type.type(:file).clear
@@ -285,7 +285,7 @@ class TestPElementServer < Test::Unit::TestCase
return
end
assert_nothing_raised("Could not reload yaml") {
- YAML::load(CGI.unescape(yaml))
+ YAML::load(Base64.decode64(yaml))
}
assert_nothing_raised {