Merge branch 'tickets/master/maint'

3 files changed, 0 insertions, 28 deletions

diff --git a/lib/puppet/interface.rb b/lib/puppet/interface.rb
index 13b1a811b..38841d948 100644
--- a/lib/puppet/interface.rb
+++ b/lib/puppet/interface.rb
@@ -53,10 +53,6 @@ class Puppet::Interface
     const_set(constantize(name), instance)
   end
 
-  def self.unload_interface(name)
-    remove_const(constantize(name)) rescue nil
-  end
-
   def self.constantize(name)
     unless name.to_s =~ /^[-_a-z]+$/i then
       raise ArgumentError, "#{name.inspect} (#{name.class}) is not a valid interface name"
diff --git a/spec/unit/interface/indirector_spec.rb b/spec/unit/interface/indirector_spec.rb
index c0b738c96..c4d93ade3 100644
--- a/spec/unit/interface/indirector_spec.rb
+++ b/spec/unit/interface/indirector_spec.rb
@@ -12,10 +12,6 @@ describe Puppet::Interface::Indirector do
     @instance.stubs(:indirection).returns @indirection
   end
 
-  after do
-    Puppet::Interface.unload_interface(:test)
-  end
-
   it "should be a subclass of Interface" do
     Puppet::Interface::Indirector.superclass.should equal(Puppet::Interface)
   end
diff --git a/spec/unit/interface_spec.rb b/spec/unit/interface_spec.rb
index cfa0111f6..73f7a4569 100755
--- a/spec/unit/interface_spec.rb
+++ b/spec/unit/interface_spec.rb
@@ -4,10 +4,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 require 'puppet/interface'
 
 describe Puppet::Interface do
-  after do
-    Puppet::Interface.unload_interface(:me)
-  end
-
   describe "at initialization" do
     it "should require a name" do
       Puppet::Interface.new(:me).name.should == :me
@@ -60,26 +56,10 @@ describe Puppet::Interface do
   it "should create an associated constant when registering an interface" do
     $stderr.stubs(:puts)
     face = Puppet::Interface.new(:me)
-    Puppet::Interface.unload_interface(:me) # to remove from the initial registration
     Puppet::Interface.register_interface(:me, face)
     Puppet::Interface::Me.should equal(face)
   end
 
-  # Why is unloading interfaces important?
-  it "should be able to unload interfaces" do
-    $stderr.stubs(:puts)
-    face = Puppet::Interface.new(:me)
-    Puppet::Interface.unload_interface(:me)
-    Puppet::Interface.const_defined?(:Me).should be_false
-  end
-
-  it "should remove the associated constant when an interface is unregistered" do
-    $stderr.stubs(:puts)
-    face = Puppet::Interface.new(:me)
-    Puppet::Interface.unload_interface(:me)
-    Puppet::Interface.const_defined?("Me").should be_false
-  end
-
   it "should try to require interfaces that are not known" do
     Puppet::Interface.expects(:require).with "puppet/interface/foo"
     Puppet::Interface.const_get(:Foo)