Looks like providers work again on Solaris.

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

3 files changed, 16 insertions, 8 deletions

diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index 385dff901..2e1bde685 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -169,8 +169,6 @@ module PuppetTest
     end
 
     def teardown
-        stopservices
-
         @@cleaners.each { |cleaner| cleaner.call() }
 
         @@tmpfiles.each { |file|
diff --git a/test/providers/package.rb b/test/providers/package.rb
index 7511fde30..6bfd7ee52 100755
--- a/test/providers/package.rb
+++ b/test/providers/package.rb
@@ -242,7 +242,10 @@ class TestPackageProvider < Test::Unit::TestCase
                 result = provider.list
             end
             result.each do |pkg|
-                assert_instance_of(Puppet::Type.type(:package), pkg)
+                assert_instance_of(Puppet::Type.type(:package), pkg,
+                    "%s returned non-package" % provider.name)
+                assert_equal(provider.name, pkg.provider.class.name,
+                    "%s did not set provider correctly" % provider.name)
             end
         end
     end
diff --git a/test/types/zone.rb b/test/types/zone.rb
index dfdcc90a4..e0df6d28a 100755
--- a/test/types/zone.rb
+++ b/test/types/zone.rb
@@ -142,8 +142,11 @@ class TestZone < Test::Unit::TestCase
         }
 
         methods.each do |m|
-            assert(Puppet::Type.type(:zone).method_defined?(m),
-                "Zones do not define method %s" % m)
+            Puppet::Type.type(:zone).suitableprovider.each do |prov|
+                assert(prov.method_defined?(m),
+                    "Zone provider %s does not define method %s" %
+                    [prov.name, m])
+            end
         end
 
     end
@@ -245,11 +248,15 @@ end
 
         #@@zones << "configtesting"
 
+        hash = nil
         assert_nothing_raised {
-            zone.send(:getconfig)
+            hash = zone.provider.send(:getconfig)
         }
 
-        # Now, make sure everything is right.
+        # Now set the configuration
+        assert_nothing_raised { zone.send(:config2status, hash) }
+
+        # And make sure it gets set correctly.
         assert_equal(%w{/sbin /usr /opt/csw /lib /platform}.sort,
             zone.is(:inherit).sort, "Inherited dirs did not get collected correctly."
         )
@@ -385,7 +392,7 @@ end
                 zone.retrieve
             }
             assert_nothing_raised {
-                zone.send(method)
+                zone.provider.send(method)
             }
             assert_nothing_raised {
                 zone.retrieve