diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-09-19 18:04:20 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-09-19 18:04:20 +0000 |
| commit | 3891f48119ea01d04d7495cf2f07a9ddb37b2afc (patch) | |
| tree | 564c02bc5cc3498a440ddea80e96a8852791c528 /test/puppet | |
| parent | dcab464f8db80e6d8c91a595a77875222f2927bf (diff) | |
| download | puppet-3891f48119ea01d04d7495cf2f07a9ddb37b2afc.tar.gz puppet-3891f48119ea01d04d7495cf2f07a9ddb37b2afc.tar.xz puppet-3891f48119ea01d04d7495cf2f07a9ddb37b2afc.zip | |
Converting to using the Rakefile for testing. The old 'test' script is
now deprecated, and I'll send an email to the dev list and update the
docs to reflect that.
This still isn't the final solution, because the module structure is a
bit weird, but at least it's a starting point, and everything from here
on out is small changes, as opposed to large architectural changes.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1632 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/puppet')
| -rwxr-xr-x | test/puppet/conffiles.rb | 9 | ||||
| -rwxr-xr-x | test/puppet/defaults.rb | 9 | ||||
| -rwxr-xr-x | test/puppet/errortest.rb | 9 |
3 files changed, 3 insertions, 24 deletions
diff --git a/test/puppet/conffiles.rb b/test/puppet/conffiles.rb index 095ac9c99..9234e2dfd 100755 --- a/test/puppet/conffiles.rb +++ b/test/puppet/conffiles.rb @@ -1,16 +1,9 @@ -if __FILE__ == $0 - $:.unshift '..' - $:.unshift '../../lib' - $puppetbase = ".." -end - require 'puppet' require 'puppet/config' require 'puppettest' -require 'test/unit' class TestConfFiles < Test::Unit::TestCase - include TestPuppet + include PuppetTest @@gooddata = [ { diff --git a/test/puppet/defaults.rb b/test/puppet/defaults.rb index 2557140e6..46accc9c6 100755 --- a/test/puppet/defaults.rb +++ b/test/puppet/defaults.rb @@ -1,17 +1,10 @@ -if __FILE__ == $0 - $:.unshift '..' - $:.unshift '../../lib' - $puppetbase = ".." -end - require 'puppet' require 'puppettest' -require 'test/unit' # $Id$ class TestPuppetDefaults < Test::Unit::TestCase - include TestPuppet + include PuppetTest @@dirs = %w{rrddir confdir vardir logdir statedir} @@files = %w{statefile manifest masterlog} @@normals = %w{puppetport masterport server} diff --git a/test/puppet/errortest.rb b/test/puppet/errortest.rb index f27d79822..264cde857 100755 --- a/test/puppet/errortest.rb +++ b/test/puppet/errortest.rb @@ -1,15 +1,8 @@ -if __FILE__ == $0 - $:.unshift '..' - $:.unshift '../../lib' - $puppetbase = "../.." -end - require 'puppet' require 'puppettest' -require 'test/unit' class TestError < Test::Unit::TestCase - include TestPuppet + include PuppetTest def test_errorisstring error = nil |