Merge branch 'ticket/2.7.next/7021-order_dependent_test_failure' into 2.7.next

* ticket/2.7.next/7021-order_dependent_test_failure:
  (#7021) Fix order dependent spec failures
  maint: Remove unused code

4 files changed, 12 insertions, 37 deletions

diff --git a/lib/puppet/provider/network_device.rb b/lib/puppet/provider/network_device.rb
index b178df977..46be27968 100644
--- a/lib/puppet/provider/network_device.rb
+++ b/lib/puppet/provider/network_device.rb
@@ -65,4 +65,4 @@ class Puppet::Provider::NetworkDevice < Puppet::Provider
   def properties
     @property_hash.dup
   end
-end
\ No newline at end of file
+end
diff --git a/lib/puppet/util/network_device.rb b/lib/puppet/util/network_device.rb
index d9c1aa34d..7fb8e2ff3 100644
--- a/lib/puppet/util/network_device.rb
+++ b/lib/puppet/util/network_device.rb
@@ -9,4 +9,9 @@ class Puppet::Util::NetworkDevice
   rescue => detail
     raise "Can't load #{device.provider} for #{device.name}: #{detail}"
   end
-end
\ No newline at end of file
+
+  # Should only be used in tests
+  def self.teardown
+    @current = nil
+  end
+end
diff --git a/spec/unit/util/network_device_spec.rb b/spec/unit/util/network_device_spec.rb
index 70cb509b4..0f7c6036b 100644
--- a/spec/unit/util/network_device_spec.rb
+++ b/spec/unit/util/network_device_spec.rb
@@ -10,6 +10,10 @@ describe Puppet::Util::NetworkDevice do
     @device = OpenStruct.new(:name => "name", :provider => "test")
   end
 
+  after(:each) do
+    Puppet::Util::NetworkDevice.teardown
+  end
+
   class Puppet::Util::NetworkDevice::Test
     class Device
       def initialize(device)
@@ -43,4 +47,4 @@ describe Puppet::Util::NetworkDevice do
       Puppet::Util::NetworkDevice.current.should == device
     end
   end
-end
\ No newline at end of file
+end
diff --git a/test/lib/puppettest/railstesting.rb b/test/lib/puppettest/railstesting.rb
index e05511e3b..f5666f2c4 100644
--- a/test/lib/puppettest/railstesting.rb
+++ b/test/lib/puppettest/railstesting.rb
@@ -14,39 +14,5 @@ module PuppetTest::RailsTesting
   def railsinit
     Puppet::Rails.init
   end
-
-  def railsteardown
-    Puppet::Rails.teardown if Puppet[:dbadapter] != "sqlite3"
-  end
-
-  def railsresource(type = "file", title = "/tmp/testing", params = {})
-    railsteardown
-    railsinit
-
-    # We need a host for resources
-    #host = Puppet::Rails::Host.new(:name => Facter.value("hostname"))
-
-    # Now build a resource
-    resources = []
-
-      resources << mkresource(
-        :type => type, :title => title, :exported => true,
-
-          :parameters => params)
-
-    # Now collect our facts
-    facts = Facter.to_hash
-
-    # Now try storing our crap
-    host = nil
-    node = mknode(facts["hostname"])
-    node.parameters = facts
-    assert_nothing_raised {
-      host = Puppet::Rails::Host.store(node, resources)
-    }
-
-    # Now save the whole thing
-    host.save
-  end
 end