Fixing a few test suites that passed when run as

part of the suite, but failed when run individually.  The
problem was that I changed lib/puppettest/support/utils to
have a separate module and I didn't test the individual files.

9 files changed, 18 insertions, 0 deletions

diff --git a/test/network/handler/resource.rb b/test/network/handler/resource.rb
index 0d6373160..b1f743082 100755
--- a/test/network/handler/resource.rb
+++ b/test/network/handler/resource.rb
@@ -3,10 +3,12 @@
 require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'base64'
 require 'cgi'
 
 class TestResourceServer < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::ServerTest
 
     def verify_described(type, described)
diff --git a/test/ral/providers/user.rb b/test/ral/providers/user.rb
index 18886118c..0651d6c74 100755
--- a/test/ral/providers/user.rb
+++ b/test/ral/providers/user.rb
@@ -3,8 +3,10 @@
 require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 
 class TestUserProvider < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
 
     def setup
diff --git a/test/ral/types/file.rb b/test/ral/types/file.rb
index 73095a783..402ca010d 100755
--- a/test/ral/types/file.rb
+++ b/test/ral/types/file.rb
@@ -3,9 +3,11 @@
 require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'fileutils'
 
 class TestFile < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
     # hmmm
     # this is complicated, because we store references to the created
diff --git a/test/ral/types/file/target.rb b/test/ral/types/file/target.rb
index f5cbe4a45..ffb60e0fa 100755
--- a/test/ral/types/file/target.rb
+++ b/test/ral/types/file/target.rb
@@ -3,9 +3,11 @@
 require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'fileutils'
 
 class TestFileTarget < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
 
     def setup
diff --git a/test/ral/types/filebucket.rb b/test/ral/types/filebucket.rb
index ecfe0e167..f9706663b 100755
--- a/test/ral/types/filebucket.rb
+++ b/test/ral/types/filebucket.rb
@@ -3,9 +3,11 @@
 require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'fileutils'
 
 class TestFileBucket < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
     # hmmm
     # this is complicated, because we store references to the created
diff --git a/test/ral/types/fileignoresource.rb b/test/ral/types/fileignoresource.rb
index 5c7536453..2314c8008 100755
--- a/test/ral/types/fileignoresource.rb
+++ b/test/ral/types/fileignoresource.rb
@@ -3,10 +3,12 @@
 require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'cgi'
 require 'fileutils'
 
 class TestFileIgnoreSources < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
    
     def setup
diff --git a/test/ral/types/filesources.rb b/test/ral/types/filesources.rb
index 1f22fc9e0..54d29968c 100755
--- a/test/ral/types/filesources.rb
+++ b/test/ral/types/filesources.rb
@@ -3,11 +3,13 @@
 require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'cgi'
 require 'fileutils'
 require 'mocha'
 
 class TestFileSources < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
     def setup
         super
diff --git a/test/ral/types/package.rb b/test/ral/types/package.rb
index 7d0caa0ba..c8d7d6088 100755
--- a/test/ral/types/package.rb
+++ b/test/ral/types/package.rb
@@ -3,12 +3,14 @@
 require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'facter'
 require 'mocha'
 
 $platform = Facter["operatingsystem"].value
 
 class TestPackages < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
     def setup
         super
diff --git a/test/ral/types/tidy.rb b/test/ral/types/tidy.rb
index e95f26b95..8813fcd3f 100755
--- a/test/ral/types/tidy.rb
+++ b/test/ral/types/tidy.rb
@@ -3,8 +3,10 @@
 require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 
 class TestTidy < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
     def mktmpfile
         # because luke's home directory is on nfs, it can't be used for testing