diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-04-04 23:13:55 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-04-04 23:13:55 +0000 |
| commit | e8c04716b2e3ef348848d85ed88c886bd43d95df (patch) | |
| tree | f2b813830ba9e43d2a63f95110b0aa72d6809c0f /test/server | |
| parent | 92302895549800d9d8384b2cc77f9b5bb4dc1fd1 (diff) | |
Fixing a couple of bugs in preparation for 0.15.2; mostly they were in the testing system and resulted from changing :File to :Manifest in server/master
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1068 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/server')
| -rw-r--r-- | test/server/master.rb | 6 | ||||
| -rw-r--r-- | test/server/server.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/server/master.rb b/test/server/master.rb index 4ece12a87..bd097a007 100644 --- a/test/server/master.rb +++ b/test/server/master.rb @@ -34,7 +34,7 @@ class TestMaster < Test::Unit::TestCase assert_nothing_raised() { # this is the default server setup master = Puppet::Server::Master.new( - :File => file, + :Manifest => file, :UseNodes => false, :Local => true ) @@ -79,7 +79,7 @@ class TestMaster < Test::Unit::TestCase assert_nothing_raised() { # this is the default server setup master = Puppet::Server::Master.new( - :File => file, + :Manifest => file, :UseNodes => false, :Local => true ) @@ -111,7 +111,7 @@ class TestMaster < Test::Unit::TestCase assert_nothing_raised() { # this is the default server setup master = Puppet::Server::Master.new( - :File => manifest, + :Manifest => manifest, :UseNodes => false, :Local => true, :FileTimeout => 15 diff --git a/test/server/server.rb b/test/server/server.rb index 89ba01b4d..2c3489fb5 100644 --- a/test/server/server.rb +++ b/test/server/server.rb @@ -85,7 +85,7 @@ class TestServer < Test::Unit::TestCase :CA => {}, # so that certs autogenerate :Master => { :UseNodes => false, - :File => file + :Manifest => file }, :Status => nil } |