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

1 files changed, 0 insertions, 34 deletions

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