diff options
Diffstat (limited to 'test/server')
| -rw-r--r-- | test/server/bucket.rb | 2 | ||||
| -rw-r--r-- | test/server/logger.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/server/bucket.rb b/test/server/bucket.rb index ac418484e..d4a2eee37 100644 --- a/test/server/bucket.rb +++ b/test/server/bucket.rb @@ -122,7 +122,7 @@ class TestBucket < Test::Unit::TestCase def setup super - @bucket = File.join(Puppet[:puppetconf], "buckettesting") + @bucket = File.join(Puppet[:confdir], "buckettesting") @@tmpfiles << @bucket end diff --git a/test/server/logger.rb b/test/server/logger.rb index 7872ed172..e0a03417e 100644 --- a/test/server/logger.rb +++ b/test/server/logger.rb @@ -16,7 +16,7 @@ class TestLogger < Test::Unit::TestCase def setup super #Puppet[:debug] = true - Puppet[:logdest] = :console + Puppet::Log.newdestination :console end # Test the log driver manually @@ -92,7 +92,7 @@ class TestLogger < Test::Unit::TestCase clientlog = tempfile() serverlog = tempfile() Puppet.warning "serverlog is %s" % serverlog - Puppet[:logdest] = clientlog + Puppet::Log.newdestination clientlog Puppet::Log.close(:syslog) # For testing @@ -113,7 +113,7 @@ class TestLogger < Test::Unit::TestCase # Start our server serverpid = fork { Puppet::Log.close(clientlog) - Puppet[:logdest] = serverlog + Puppet::Log.newdestination serverlog assert_nothing_raised() { trap(:INT) { logger.shutdown } logger.start @@ -152,7 +152,7 @@ class TestLogger < Test::Unit::TestCase # and now use the normal client action # Set the log destination to be the server - Puppet[:logdest] = "localhost:%s" % @@port + Puppet::Log.newdestination "localhost:%s" % @@port # And now do some logging assert_nothing_raised { |