diff options
Diffstat (limited to 'test/server')
| -rw-r--r-- | test/server/tc_bucket.rb | 14 | ||||
| -rw-r--r-- | test/server/tc_server.rb | 10 |
2 files changed, 23 insertions, 1 deletions
diff --git a/test/server/tc_bucket.rb b/test/server/tc_bucket.rb index 0d81474a3..813ea7a61 100644 --- a/test/server/tc_bucket.rb +++ b/test/server/tc_bucket.rb @@ -50,6 +50,13 @@ class TestBucket < Test::Unit::TestCase @@tmppids = [] @@tmpfiles = [@bucket] + + @oldconf = Puppet[:puppetconf] + Puppet[:puppetconf] = "/tmp/buckettesting" + @oldvar = Puppet[:puppetvar] + Puppet[:puppetvar] = "/tmp/buckettesting" + + @@tmpfiles << "/tmp/buckettesting" end def teardown @@ -61,6 +68,9 @@ class TestBucket < Test::Unit::TestCase @@tmppids.each { |pid| system("kill -INT %s" % pid) } + + Puppet[:puppetconf] = @oldconf + Puppet[:puppetvar] = @oldvar end def test_localserver @@ -170,6 +180,8 @@ class TestBucket < Test::Unit::TestCase tmpdir = File.join(@bucket,"tmpfiledir") Puppet.recmkdir(tmpdir) + asign = Puppet[:autosign] + Puppet[:autosign] = true server = nil client = nil port = Puppet[:masterport] @@ -254,5 +266,7 @@ class TestBucket < Test::Unit::TestCase raise "Uh, we don't have a child pid" end system("kill %s" % pid) + + Puppet[:autosign] = asign end end diff --git a/test/server/tc_server.rb b/test/server/tc_server.rb index 1b7225748..3854f848c 100644 --- a/test/server/tc_server.rb +++ b/test/server/tc_server.rb @@ -30,7 +30,12 @@ class TestServer < Test::Unit::TestCase #Puppet::Type.type(:service).setpath(paths) end - @@tmpfiles = [] + @oldconf = Puppet[:puppetconf] + Puppet[:puppetconf] = "/tmp/servertesting" + @oldvar = Puppet[:puppetvar] + Puppet[:puppetvar] = "/tmp/servertesting" + + @@tmpfiles = ["/tmp/servertesting"] @@tmppids = [] end @@ -55,6 +60,9 @@ class TestServer < Test::Unit::TestCase @@tmppids.each { |pid| system("kill -INT %s" % pid) } + + Puppet[:puppetconf] = @oldconf + Puppet[:puppetvar] = @oldvar end def test_start |