Adding the integration tests to the Rakefile for spec,

fixing the integration tests, and extending the Classmethods
for the indirector so that indirected classes can set the
terminus class and cache class.

2 files changed, 2 insertions, 3 deletions

diff --git a/spec/integration/checksum.rb b/spec/integration/checksum.rb
index f112f7502..cb187c656 100755
--- a/spec/integration/checksum.rb
+++ b/spec/integration/checksum.rb
@@ -9,8 +9,7 @@ require 'puppet/checksum'
 
 describe Puppet::Checksum, " when using the file terminus" do
     before do
-        Puppet[:checksum_terminus] = "file"
-
+        Puppet::Checksum.terminus_class = :file
         @content = "this is some content"
         @sum = Puppet::Checksum.new(@content)
 
diff --git a/spec/integration/node.rb b/spec/integration/node.rb
index 8bc641bae..e4a311998 100755
--- a/spec/integration/node.rb
+++ b/spec/integration/node.rb
@@ -10,8 +10,8 @@ require 'puppet/node'
 describe Puppet::Node, " when using the memory terminus" do
     before do
         @name = "me"
+        Puppet::Node.terminus_class = :memory
         @node = Puppet::Node.new(@name)
-        Puppet[:node_terminus] = "memory"
     end
 
     it "should find no nodes by default" do