summaryrefslogtreecommitdiffstats
path: root/test/executables/puppetmasterd.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-02-08 01:39:39 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-02-08 01:39:39 +0000
commit7e07e3dc843798bdbc7a03428ca054adaff2fb72 (patch)
tree34d0f9f8c2ee11bdc281e6e4d18cad444253fe36 /test/executables/puppetmasterd.rb
parent6d8068eddd0d29ec53f62557eb53f6ebb8e40591 (diff)
downloadpuppet-7e07e3dc843798bdbc7a03428ca054adaff2fb72.tar.gz
puppet-7e07e3dc843798bdbc7a03428ca054adaff2fb72.tar.xz
puppet-7e07e3dc843798bdbc7a03428ca054adaff2fb72.zip
Moving all of the client and server code into a single network/ directory. In other words, more code structure cleanup.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2179 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/executables/puppetmasterd.rb')
-rwxr-xr-xtest/executables/puppetmasterd.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb
index 6fc98137b..4563a0216 100755
--- a/test/executables/puppetmasterd.rb
+++ b/test/executables/puppetmasterd.rb
@@ -3,7 +3,7 @@
$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
require 'puppet/daemon'
require 'puppettest'
require 'socket'
@@ -35,7 +35,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
client = nil
assert_nothing_raised() {
- client = Puppet::Client::StatusClient.new(
+ client = Puppet::Network::Client::StatusClient.new(
:Server => "localhost",
:Port => @@port
)
@@ -65,7 +65,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
# this client shoulduse the same certs
assert_nothing_raised() {
- client = Puppet::Client::MasterClient.new(
+ client = Puppet::Network::Client::MasterClient.new(
:Server => "localhost",
:Port => @@port
)