summaryrefslogtreecommitdiffstats
path: root/spec/integration/network
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-05-02 12:58:35 -0500
committerLuke Kanies <luke@madstop.com>2008-05-02 12:58:35 -0500
commit31b79fa7760f95059a4e2afb35e734de283cf4a0 (patch)
tree5e8cf6732758e3548103d2523fccecb056c39c1d /spec/integration/network
parent7a876ed6a06bc5decb257126eb57368aeb178a81 (diff)
downloadpuppet-31b79fa7760f95059a4e2afb35e734de283cf4a0.tar.gz
puppet-31b79fa7760f95059a4e2afb35e734de283cf4a0.tar.xz
puppet-31b79fa7760f95059a4e2afb35e734de283cf4a0.zip
Adding xmlrpc support to webrick.
This provides the backward compatibility for webrick, and only Mongrel is left.
Diffstat (limited to 'spec/integration/network')
-rwxr-xr-x[-rw-r--r--]spec/integration/network/server/mongrel.rb0
-rwxr-xr-x[-rw-r--r--]spec/integration/network/server/webrick.rb4
2 files changed, 3 insertions, 1 deletions
diff --git a/spec/integration/network/server/mongrel.rb b/spec/integration/network/server/mongrel.rb
index a4089585e..a4089585e 100644..100755
--- a/spec/integration/network/server/mongrel.rb
+++ b/spec/integration/network/server/mongrel.rb
diff --git a/spec/integration/network/server/webrick.rb b/spec/integration/network/server/webrick.rb
index ee307bca3..120f2946c 100644..100755
--- a/spec/integration/network/server/webrick.rb
+++ b/spec/integration/network/server/webrick.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
require File.dirname(__FILE__) + '/../../../spec_helper'
require 'puppet/network/server'
require 'puppet/ssl/certificate_authority'
@@ -8,7 +10,7 @@ describe Puppet::Network::Server do
before :each do
Puppet[:servertype] = 'webrick'
Puppet[:hostcrl] = 'false'
- @params = { :address => "127.0.0.1", :port => 34343, :handlers => [ :node ] }
+ @params = { :address => "127.0.0.1", :port => 34343, :handlers => [ :node ], :xmlrpc_handlers => [ :status ] }
# Get a safe temporary file
@tmpfile = Tempfile.new("webrick_integration_testing")