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

2 files changed, 7 insertions, 2 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