Reorganizing some of the tests.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2170 980ebf18-57e1-0310-9a29-db15c13687c0

36 files changed, 54 insertions, 95 deletions

diff --git a/test/providers/group.rb b/test/ral/providers/group.rb
index 1333f28b7..ba362c1e6 100755
--- a/test/providers/group.rb
+++ b/test/ral/providers/group.rb
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'etc'
-require 'puppet/type'
 require 'puppettest'
+require 'etc'
 
 class TestGroupProvider < Test::Unit::TestCase
 	include PuppetTest
diff --git a/test/providers/host/netinfo.rb b/test/ral/providers/host/netinfo.rb
index e6bbc22d6..8c9e8bdb4 100755
--- a/test/providers/host/netinfo.rb
+++ b/test/ral/providers/host/netinfo.rb
@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2006-11-12.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 
@@ -55,4 +55,4 @@ end
 end
 end
 
-# $Id$
\ No newline at end of file
+# $Id$
diff --git a/test/providers/host/parsed.rb b/test/ral/providers/host/parsed.rb
index d0b072e7d..1e50dc58c 100755
--- a/test/providers/host/parsed.rb
+++ b/test/ral/providers/host/parsed.rb
@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
 
 require 'etc'
-require 'puppet/type'
 require 'puppettest'
 require 'puppettest/fileparsing'
 require 'test/unit'
diff --git a/test/providers/mount/netinfo.rb b/test/ral/providers/mount/netinfo.rb
index 1ee09e7da..af65e5a4d 100755
--- a/test/providers/mount/netinfo.rb
+++ b/test/ral/providers/mount/netinfo.rb
@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2006-11-12.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 # 
diff --git a/test/providers/mount/parsed.rb b/test/ral/providers/mount/parsed.rb
index 9e9aec72e..83713708d 100755
--- a/test/providers/mount/parsed.rb
+++ b/test/ral/providers/mount/parsed.rb
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib").unshift("../../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppettest/fileparsing'
-require 'puppet'
 require 'facter'
 
 class TestParsedMounts < Test::Unit::TestCase
diff --git a/test/providers/nameservice.rb b/test/ral/providers/nameservice.rb
index 20624d175..e318db770 100755
--- a/test/providers/nameservice.rb
+++ b/test/ral/providers/nameservice.rb
@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
-require 'puppet'
 require 'puppet/provider/nameservice'
 require 'facter'
 
diff --git a/test/providers/package.rb b/test/ral/providers/package.rb
index 6bfd7ee52..5d4ad9e7c 100755
--- a/test/providers/package.rb
+++ b/test/ral/providers/package.rb
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'etc'
-require 'puppet/type'
 require 'puppettest'
+require 'etc'
 
 class TestPackageProvider < Test::Unit::TestCase
 	include PuppetTest
diff --git a/test/providers/parsedfile.rb b/test/ral/providers/parsedfile.rb
index 952626001..fb5eb35ad 100755
--- a/test/providers/parsedfile.rb
+++ b/test/ral/providers/parsedfile.rb
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppettest/fileparsing'
-require 'puppet'
 require 'puppet/filetype'
 require 'puppet/provider/parsedfile'
 require 'facter'
diff --git a/test/providers/parsedport.rb b/test/ral/providers/parsedport.rb
index 8478c47da..929a02327 100755
--- a/test/providers/parsedport.rb
+++ b/test/ral/providers/parsedport.rb
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-#require 'puppettest'
+require 'puppettest'
 #require 'puppettest/fileparsing'
-#require 'puppet'
 #require 'puppet/type/port'
 #require 'test/unit'
 #require 'facter'
diff --git a/test/providers/parsedsshkey.rb b/test/ral/providers/parsedsshkey.rb
index 898c449ce..f79e7be94 100755
--- a/test/providers/parsedsshkey.rb
+++ b/test/ral/providers/parsedsshkey.rb
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppettest/fileparsing'
-require 'puppet'
 require 'puppet/type/sshkey'
 
 class TestParsedSSHKey < Test::Unit::TestCase
diff --git a/test/providers/provider.rb b/test/ral/providers/provider.rb
index 61090d5db..d9b071882 100755
--- a/test/providers/provider.rb
+++ b/test/ral/providers/provider.rb
@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
-require 'puppet'
 require 'facter'
 
 class TestProvider < Test::Unit::TestCase
diff --git a/test/providers/service/base.rb b/test/ral/providers/service/base.rb
index 38f2df5e6..03e7105ca 100755
--- a/test/providers/service/base.rb
+++ b/test/ral/providers/service/base.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-01-28.
 #  Copyright (c) 2007. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 
@@ -72,4 +72,4 @@ class TestBaseServiceProvider < Test::Unit::TestCase
     end
 end
 
-# $Id$
\ No newline at end of file
+# $Id$
diff --git a/test/providers/user.rb b/test/ral/providers/user.rb
index 341049ea3..94baca37b 100755
--- a/test/providers/user.rb
+++ b/test/ral/providers/user.rb
@@ -1,10 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
-require 'puppet'
-require 'facter'
 
 class TestUserProvider < Test::Unit::TestCase
     include PuppetTest::FileTesting
diff --git a/test/types/basic.rb b/test/ral/types/basic.rb
index 64e08d1cb..5d09a5183 100755
--- a/test/types/basic.rb
+++ b/test/ral/types/basic.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
 require 'puppettest'
 
 class TestBasic < Test::Unit::TestCase
diff --git a/test/types/component.rb b/test/ral/types/component.rb
index 3b55bab0f..06c32dd01 100755
--- a/test/types/component.rb
+++ b/test/ral/types/component.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
 require 'puppettest'
 require 'puppettest/support/resources'
 
diff --git a/test/types/cron.rb b/test/ral/types/cron.rb
index c4d818a33..bf166c70f 100755
--- a/test/types/cron.rb
+++ b/test/ral/types/cron.rb
@@ -1,12 +1,10 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
-
-# Test cron job creation, modification, and destruction
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
-require 'puppet'
-require 'facter'
+
+# Test cron job creation, modification, and destruction
 
 class TestCron < Test::Unit::TestCase
 	include PuppetTest
diff --git a/test/types/exec.rb b/test/ral/types/exec.rb
index 71b98cf3f..ed7acbd25 100755
--- a/test/types/exec.rb
+++ b/test/ral/types/exec.rb
@@ -1,10 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
 require 'puppettest'
-require 'facter'
 
 class TestExec < Test::Unit::TestCase
 	include PuppetTest
diff --git a/test/types/file.rb b/test/ral/types/file.rb
index e174465e2..af4a3a8b3 100755
--- a/test/types/file.rb
+++ b/test/ral/types/file.rb
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'fileutils'
 require 'puppettest'
+require 'fileutils'
 
 class TestFile < Test::Unit::TestCase
     include PuppetTest::FileTesting
diff --git a/test/types/filebucket.rb b/test/ral/types/filebucket.rb
index e95db2a41..931c571dc 100755
--- a/test/types/filebucket.rb
+++ b/test/ral/types/filebucket.rb
@@ -1,12 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'fileutils'
 require 'puppettest'
-
-# $Id$
+require 'fileutils'
 
 class TestFileBucket < Test::Unit::TestCase
     include PuppetTest::FileTesting
@@ -153,3 +150,5 @@ class TestFileBucket < Test::Unit::TestCase
         )
     end
 end
+
+# $Id$
diff --git a/test/types/fileignoresource.rb b/test/ral/types/fileignoresource.rb
index c012f9be1..214a865f5 100755
--- a/test/types/fileignoresource.rb
+++ b/test/ral/types/fileignoresource.rb
@@ -1,12 +1,10 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
+require 'puppettest'
 require 'cgi'
 require 'fileutils'
-require 'puppettest'
-
 
 class TestFileIgnoreSources < Test::Unit::TestCase
     include PuppetTest::FileTesting
diff --git a/test/types/filesources.rb b/test/ral/types/filesources.rb
index f372fb8e9..dc4bbdb07 100755
--- a/test/types/filesources.rb
+++ b/test/ral/types/filesources.rb
@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
+require 'puppettest'
 require 'cgi'
 require 'fileutils'
-require 'puppettest'
 
 class TestFileSources < Test::Unit::TestCase
     include PuppetTest::FileTesting
diff --git a/test/types/group.rb b/test/ral/types/group.rb
index 2ca3ab5e5..9f091f699 100755
--- a/test/types/group.rb
+++ b/test/ral/types/group.rb
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'etc'
-require 'puppet/type'
 require 'puppettest'
+require 'etc'
 
 class TestGroup < Test::Unit::TestCase
 	include PuppetTest
diff --git a/test/types/host.rb b/test/ral/types/host.rb
index 56d12e560..f315cbd1f 100755
--- a/test/types/host.rb
+++ b/test/ral/types/host.rb
@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
-require 'puppet'
 require 'test/unit'
 require 'facter'
 
diff --git a/test/types/mount.rb b/test/ral/types/mount.rb
index 9abf93476..5987db631 100755
--- a/test/types/mount.rb
+++ b/test/ral/types/mount.rb
@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
-require 'puppet'
 
 unless Facter.value(:operatingsystem) == "Darwin"
 class TestMounts < Test::Unit::TestCase
diff --git a/test/types/package.rb b/test/ral/types/package.rb
index 009bedf33..f49a36bb6 100755
--- a/test/types/package.rb
+++ b/test/ral/types/package.rb
@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
-require 'puppet'
 require 'facter'
 
 $platform = Facter["operatingsystem"].value
diff --git a/test/types/parameter.rb b/test/ral/types/parameter.rb
index a47f479d3..784378f9f 100755
--- a/test/types/parameter.rb
+++ b/test/ral/types/parameter.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet/type'
 require 'puppettest'
 
 class TestParameter < Test::Unit::TestCase
diff --git a/test/types/port.rb b/test/ral/types/port.rb
index c0fa7c1c2..30292e1af 100755
--- a/test/types/port.rb
+++ b/test/ral/types/port.rb
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+
+require 'puppettest'
 
-#require 'puppettest'
-#require 'puppet'
-#require 'test/unit'
 #require 'facter'
 #
 #class TestPort < Test::Unit::TestCase
diff --git a/test/types/property.rb b/test/ral/types/property.rb
index b63b7237f..38a4b2e81 100755
--- a/test/types/property.rb
+++ b/test/ral/types/property.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet/type'
 require 'puppettest'
 
 class TestProperty < Test::Unit::TestCase
diff --git a/test/types/resources.rb b/test/ral/types/resources.rb
index bb2c26080..efd84a431 100755
--- a/test/types/resources.rb
+++ b/test/ral/types/resources.rb
@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2006-12-12.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 
diff --git a/test/types/schedule.rb b/test/ral/types/schedule.rb
index a14afa85e..e50f88bab 100755
--- a/test/types/schedule.rb
+++ b/test/ral/types/schedule.rb
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/type/schedule'
 require 'puppettest'
+require 'puppet/type/schedule'
 
 class TestSchedule < Test::Unit::TestCase
     include PuppetTest
diff --git a/test/types/service.rb b/test/ral/types/service.rb
index b6f191562..005f00e63 100755
--- a/test/types/service.rb
+++ b/test/ral/types/service.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
 require 'puppettest'
 
 $skipsvcs = false
diff --git a/test/types/sshkey.rb b/test/ral/types/sshkey.rb
index ac4565e36..e8ee575d9 100755
--- a/test/types/sshkey.rb
+++ b/test/ral/types/sshkey.rb
@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
-require 'puppet'
 require 'puppet/type/sshkey'
 require 'facter'
 
diff --git a/test/types/tidy.rb b/test/ral/types/tidy.rb
index 58dd2c263..5e6720bb3 100755
--- a/test/types/tidy.rb
+++ b/test/ral/types/tidy.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
 require 'puppettest'
 
 class TestTidy < Test::Unit::TestCase
diff --git a/test/types/user.rb b/test/ral/types/user.rb
index 7d7b5a427..6feb90742 100755
--- a/test/types/user.rb
+++ b/test/ral/types/user.rb
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'etc'
-require 'puppet/type'
 require 'puppettest'
+require 'etc'
 
 class TestUser < Test::Unit::TestCase
 	include PuppetTest
diff --git a/test/types/yumrepo.rb b/test/ral/types/yumrepo.rb
index cd0fb0f42..2f8be32c6 100755
--- a/test/types/yumrepo.rb
+++ b/test/ral/types/yumrepo.rb
@@ -1,11 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
-
-# Test the yumrepo type
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
-require 'puppet'
 require 'fileutils'
 
 class TestYumRepo < Test::Unit::TestCase
diff --git a/test/types/zone.rb b/test/ral/types/zone.rb
index 75969945e..d5cb0f739 100755
--- a/test/types/zone.rb
+++ b/test/ral/types/zone.rb
@@ -1,13 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
-
-# Test host job creation, modification, and destruction
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
-require 'puppet'
 require 'puppet/type/zone'
-require 'facter'
 
 class TestZone < Test::Unit::TestCase
 	include PuppetTest