diff options
Diffstat (limited to 'test/server')
| -rwxr-xr-x | test/server/authconfig.rb | 11 | ||||
| -rwxr-xr-x | test/server/authstore.rb | 15 | ||||
| -rw-r--r-- | test/server/bucket.rb | 14 | ||||
| -rw-r--r-- | test/server/ca.rb | 11 | ||||
| -rwxr-xr-x | test/server/fileserver.rb | 16 | ||||
| -rw-r--r-- | test/server/logger.rb | 11 | ||||
| -rw-r--r-- | test/server/master.rb | 15 | ||||
| -rw-r--r-- | test/server/pelement.rb | 13 | ||||
| -rwxr-xr-x | test/server/report.rb | 11 | ||||
| -rwxr-xr-x | test/server/rights.rb | 11 | ||||
| -rwxr-xr-x | test/server/runner.rb | 11 | ||||
| -rw-r--r-- | test/server/server.rb | 11 |
12 files changed, 25 insertions, 125 deletions
diff --git a/test/server/authconfig.rb b/test/server/authconfig.rb index 32ae46dff..a5a0a1c00 100755 --- a/test/server/authconfig.rb +++ b/test/server/authconfig.rb @@ -1,16 +1,9 @@ -if __FILE__ == $0 - $:.unshift '../../lib' - $:.unshift '..' - $puppetbase = "../.." -end - require 'puppet' require 'puppet/server/authconfig' -require 'test/unit' -require 'puppettest.rb' +require 'puppettest' class TestAuthConfig < Test::Unit::TestCase - include TestPuppet + include PuppetTest def test_parsingconfigfile file = tempfile() diff --git a/test/server/authstore.rb b/test/server/authstore.rb index db580d68e..30eb5ea04 100755 --- a/test/server/authstore.rb +++ b/test/server/authstore.rb @@ -1,20 +1,9 @@ -if __FILE__ == $0 - if Dir.getwd =~ /test\/server$/ - Dir.chdir("..") - end - - $:.unshift '../lib' - $puppetbase = ".." - -end - require 'puppet' require 'puppet/server/authstore' -require 'test/unit' -require 'puppettest.rb' +require 'puppettest' class TestAuthStore < Test::Unit::TestCase - include TestPuppet + include PuppetTest def mkstore store = nil assert_nothing_raised { diff --git a/test/server/bucket.rb b/test/server/bucket.rb index af2fd0865..dcb50d27e 100644 --- a/test/server/bucket.rb +++ b/test/server/bucket.rb @@ -1,19 +1,9 @@ -if __FILE__ == $0 - $:.unshift '../../lib' - $:.unshift '..' - $puppetbase = "../.." - $debug = true -else - $debug = false -end - require 'puppet' -require 'test/unit' -require 'puppettest.rb' +require 'puppettest' require 'base64' class TestBucket < Test::Unit::TestCase - include ServerTest + include PuppetTest::ServerTest def out if defined? @num diff --git a/test/server/ca.rb b/test/server/ca.rb index b7bad5cd6..8be0df334 100644 --- a/test/server/ca.rb +++ b/test/server/ca.rb @@ -1,15 +1,8 @@ -if __FILE__ == $0 - $:.unshift '../../lib' - $:.unshift '..' - $puppetbase = "../.." -end - require 'puppet' require 'puppet/server/ca' require 'puppet/sslcertificates' require 'openssl' -require 'test/unit' -require 'puppettest.rb' +require 'puppettest' # $Id$ @@ -20,7 +13,7 @@ else end class TestCA < Test::Unit::TestCase - include ServerTest + include PuppetTest::ServerTest # Verify that we're autosigning. We have to autosign a "different" machine, # since we always autosign the CA server's certificate. def test_autocertgeneration diff --git a/test/server/fileserver.rb b/test/server/fileserver.rb index b42b1712f..e7aaa6017 100755 --- a/test/server/fileserver.rb +++ b/test/server/fileserver.rb @@ -1,20 +1,9 @@ -if __FILE__ == $0 - if Dir.getwd =~ /test\/server$/ - Dir.chdir("..") - end - - $:.unshift '../lib' - $puppetbase = ".." - -end - require 'puppet' require 'puppet/server/fileserver' -require 'test/unit' -require 'puppettest.rb' +require 'puppettest' class TestFileServer < Test::Unit::TestCase - include TestPuppet + include PuppetTest def mkmount(path = nil) mount = nil @@ -53,7 +42,6 @@ class TestFileServer < Test::Unit::TestCase def mktestfiles(testdir) @@tmpfiles << testdir assert_nothing_raised { - Dir.mkdir(testdir) files = %w{a b c d e}.collect { |l| name = File.join(testdir, "file%s" % l) File.open(name, "w") { |f| diff --git a/test/server/logger.rb b/test/server/logger.rb index e0a03417e..8ba0d0067 100644 --- a/test/server/logger.rb +++ b/test/server/logger.rb @@ -1,17 +1,10 @@ -if __FILE__ == $0 - $:.unshift '../../lib' - $:.unshift '..' - $puppetbase = "../.." -end - require 'puppet' -require 'test/unit' -require 'puppettest.rb' +require 'puppettest' require 'base64' require 'cgi' class TestLogger < Test::Unit::TestCase - include ServerTest + include PuppetTest::ServerTest def setup super diff --git a/test/server/master.rb b/test/server/master.rb index 2f6804e56..2d1b9ec2c 100644 --- a/test/server/master.rb +++ b/test/server/master.rb @@ -1,21 +1,10 @@ -if __FILE__ == $0 - if Dir.getwd =~ /test\/server$/ - Dir.chdir("..") - end - - $:.unshift '../lib' - $puppetbase = ".." - -end - require 'puppet' require 'puppet/server' require 'puppet/client' -require 'test/unit' -require 'puppettest.rb' +require 'puppettest' class TestMaster < Test::Unit::TestCase - include ServerTest + include PuppetTest::ServerTest def teardown super #print "\n\n\n\n" if Puppet[:debug] diff --git a/test/server/pelement.rb b/test/server/pelement.rb index 5d5b5ceb4..edfe89744 100644 --- a/test/server/pelement.rb +++ b/test/server/pelement.rb @@ -1,18 +1,11 @@ -if __FILE__ == $0 - $:.unshift '../../lib' - $:.unshift '..' - $puppetbase = "../.." -end - require 'puppet' require 'puppet/server/pelement' -require 'test/unit' -require 'puppettest.rb' +require 'puppettest' require 'base64' require 'cgi' class TestPElementServer < Test::Unit::TestCase - include ServerTest + include PuppetTest::ServerTest def verify_described(type, described) described.each do |name, trans| @@ -175,7 +168,7 @@ class TestPElementServer < Test::Unit::TestCase def test_describe_alltypes # Systems get pretty retarded, so I'm going to set the path to some fake # data for ports - #Puppet::Type::ParsedType::Port.path = File.join($puppetbase, + #Puppet::Type::ParsedType::Port.path = File.join(basedir, # "test/data/types/ports/1") #Puppet.err Puppet::Type::ParsedType::Port.path server = nil diff --git a/test/server/report.rb b/test/server/report.rb index 5e74dc1da..423b8ce90 100755 --- a/test/server/report.rb +++ b/test/server/report.rb @@ -1,17 +1,10 @@ -if __FILE__ == $0 - $:.unshift '../../lib' - $:.unshift '..' - $puppetbase = "../.." -end - require 'puppet' require 'puppet/server/report' require 'puppet/client/reporter' -require 'test/unit' -require 'puppettest.rb' +require 'puppettest' class TestReportServer < Test::Unit::TestCase - include TestPuppet + include PuppetTest Puppet::Util.logmethods(self) def mkserver diff --git a/test/server/rights.rb b/test/server/rights.rb index 09cb21e56..ac0944bd0 100755 --- a/test/server/rights.rb +++ b/test/server/rights.rb @@ -1,16 +1,9 @@ -if __FILE__ == $0 - $:.unshift '../../lib' - $:.unshift '..' - $puppetbase = "../.." -end - require 'puppet' require 'puppet/server/rights' -require 'test/unit' -require 'puppettest.rb' +require 'puppettest' class TestRights < Test::Unit::TestCase - include TestPuppet + include PuppetTest def test_rights store = nil diff --git a/test/server/runner.rb b/test/server/runner.rb index 59487776f..1c2fa9cea 100755 --- a/test/server/runner.rb +++ b/test/server/runner.rb @@ -1,16 +1,9 @@ -if __FILE__ == $0 - $:.unshift '../../lib' - $:.unshift '..' - $puppetbase = "../.." -end - require 'puppet' require 'puppet/server/runner' -require 'test/unit' -require 'puppettest.rb' +require 'puppettest' class TestServerRunner < Test::Unit::TestCase - include TestPuppet + include PuppetTest def mkclient(file) master = nil diff --git a/test/server/server.rb b/test/server/server.rb index e279d8440..681fa1f42 100644 --- a/test/server/server.rb +++ b/test/server/server.rb @@ -1,13 +1,6 @@ -if __FILE__ == $0 - $:.unshift '../../lib' - $:.unshift '..' - $puppetbase = "../.." -end - require 'puppet' require 'puppet/server' -require 'test/unit' -require 'puppettest.rb' +require 'puppettest' # $Id$ @@ -18,7 +11,7 @@ else end class TestServer < Test::Unit::TestCase - include ServerTest + include PuppetTest::ServerTest # test that we can connect to the server # we have to use fork here, because we apparently can't use threads |