Making the package provider tests able to be executed separately, and using "clear" instead of resetting @objects in the types.

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

3 files changed, 9 insertions, 6 deletions

diff --git a/test/ral/providers/package/apt.rb b/test/ral/providers/package/apt.rb
index f0a13d3aa..06260a134 100644..100755
--- a/test/ral/providers/package/apt.rb
+++ b/test/ral/providers/package/apt.rb
@@ -1,12 +1,13 @@
+#!/usr/bin/env ruby
+
 require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'mocha'
 
 class AptPackageProviderTest < Test::Unit::TestCase
 	def setup
+        super
 		@type = Puppet::Type.type(:package)
-		# This is hideous, but absent a 'reset' button on types...
-		@type.instance_eval("@objects = {}")
 	end
 	
 	def test_install
diff --git a/test/ral/providers/package/aptitude.rb b/test/ral/providers/package/aptitude.rb
index 0a686559e..a492957f2 100644..100755
--- a/test/ral/providers/package/aptitude.rb
+++ b/test/ral/providers/package/aptitude.rb
@@ -1,12 +1,13 @@
+#!/usr/bin/env ruby
+
 require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'mocha'
 
 class AptitudePackageProviderTest < Test::Unit::TestCase
 	def setup
+        super
 		@type = Puppet::Type.type(:package)
-		# This is hideous, but absent a 'reset' button on types...
-		@type.instance_eval("@objects = {}")
 	end
 	
 	def test_install
diff --git a/test/ral/providers/package/dpkg.rb b/test/ral/providers/package/dpkg.rb
index 2557dd073..cfdf3fee9 100644..100755
--- a/test/ral/providers/package/dpkg.rb
+++ b/test/ral/providers/package/dpkg.rb
@@ -1,12 +1,13 @@
+#!/usr/bin/env ruby
+
 require File.dirname(__FILE__) + '/../../../lib/puppettest'
 
 require 'mocha'
 
 class DpkgPackageProviderTest < Test::Unit::TestCase
 	def setup
+        super
 		@type = Puppet::Type.type(:package)
-		# This is hideous, but absent a 'reset' button on types...
-		@type.instance_eval("@objects = {}")
 	end
 	
 	def test_install