diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-09-22 17:59:50 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-09-22 17:59:50 +0000 |
| commit | 55901486d236f98ecfb2717509c5904687969f25 (patch) | |
| tree | 87c704c49302c470263e2136c99ff25156b7448f /test/server | |
| parent | f7d9b83a83bf43b13846c4b621794257f04832bb (diff) | |
| download | puppet-55901486d236f98ecfb2717509c5904687969f25.tar.gz puppet-55901486d236f98ecfb2717509c5904687969f25.tar.xz puppet-55901486d236f98ecfb2717509c5904687969f25.zip | |
Okay, all tests pass again. The work done on nodes will take a little while to clarify and such, but it should work pretty well.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@698 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/server')
| -rw-r--r-- | test/server/tc_master.rb | 4 | ||||
| -rw-r--r-- | test/server/tc_server.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/test/server/tc_master.rb b/test/server/tc_master.rb index 29a10662b..4fb8df8b2 100644 --- a/test/server/tc_master.rb +++ b/test/server/tc_master.rb @@ -25,6 +25,7 @@ class TestMaster < ServerTest def test_files count = 0 textfiles { |file| + Puppet.err :mark Puppet.debug("parsing %s" % file) client = nil master = nil @@ -34,6 +35,7 @@ class TestMaster < ServerTest # this is the default server setup master = Puppet::Server::Master.new( :File => file, + :UseNodes => false, :Local => true ) } @@ -78,6 +80,7 @@ class TestMaster < ServerTest # this is the default server setup master = Puppet::Server::Master.new( :File => file, + :UseNodes => false, :Local => true ) } @@ -108,6 +111,7 @@ class TestMaster < ServerTest # this is the default server setup master = Puppet::Server::Master.new( :File => manifest, + :UseNodes => false, :Local => true, :FileTimeout => 0.5 ) diff --git a/test/server/tc_server.rb b/test/server/tc_server.rb index b0afc6398..d7056eef4 100644 --- a/test/server/tc_server.rb +++ b/test/server/tc_server.rb @@ -87,6 +87,7 @@ class TestServer < ServerTest :Handlers => { :CA => {}, # so that certs autogenerate :Master => { + :UseNodes => false, :File => file }, :Status => nil |