Merge branch '0.24.x' Removed the 'after' blocks that call Type.clear,

since that method is deprecated.

Conflicts:

	CHANGELOG
	bin/puppetca
	lib/puppet/file_serving/fileset.rb
	lib/puppet/network/xmlrpc/client.rb
	lib/puppet/type/file/selcontext.rb
	spec/unit/file_serving/metadata.rb
	spec/unit/type/file.rb

2 files changed, 43 insertions, 0 deletions

diff --git a/spec/integration/provider/package.rb b/spec/integration/provider/package.rb
new file mode 100755
index 000000000..24a196266
--- /dev/null
+++ b/spec/integration/provider/package.rb
@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+
+describe "Package Provider" do
+    Puppet::Type.type(:package).providers.each do |name|
+        provider = Puppet::Type.type(:package).provider(name)
+
+        describe name do
+            confine "Provider %s is not suitable" % name => provider.suitable?
+
+            it "should fail when asked to install an invalid package" do
+                pending("This test hangs forever with recent versions of RubyGems") if provider.name == :gem
+                pkg = Puppet::Type.newpackage :name => "nosuch%s" % provider.name.to_s, :provider => provider.name
+                lambda { pkg.provider.install }.should raise_error
+            end
+
+            it "should be able to get a list of existing packages" do
+                provider.instances.each do |package|
+                    package.should be_instance_of(provider)
+                    package.properties[:provider].should == provider.name
+                end
+            end
+        end
+    end
+end
diff --git a/spec/integration/reference/providers.rb b/spec/integration/reference/providers.rb
new file mode 100755
index 000000000..79b6ce12d
--- /dev/null
+++ b/spec/integration/reference/providers.rb
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+
+require 'puppet/util/reference'
+
+reference = Puppet::Util::Reference.reference(:providers)
+
+describe reference do
+    it "should exist" do
+        reference.should_not be_nil
+    end
+
+    it "should be able to be rendered as text" do
+        lambda { reference.to_text }.should_not raise_error
+    end
+end