[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 49d4d01e7733f479ecc20cfc3632301ed487c38e
Author: Nigel Kersten <nigelk at google.com>
Date:   Mon Dec 1 19:10:19 2008 -0800

    Trim down the after block clears to try to make the tests work for the build servers
    
    Remove the require line so that it doesn't conflict with puppet's autoloader

diff --git a/spec/unit/type/computer.rb b/spec/unit/type/computer.rb
index ec3c797..ed264d1 100755
--- a/spec/unit/type/computer.rb
+++ b/spec/unit/type/computer.rb
@@ -1,13 +1,11 @@
 #!/usr/bin/env ruby
  
 require File.dirname(__FILE__) + '/../../spec_helper'
- 
-require 'puppet/type/computer'
 
 computer = Puppet::Type.type(:computer)
 
 describe Puppet.type(:computer), " when checking computer objects" do
-    before :each do
+    before do
         provider_class = Puppet::Type::Computer.provider(Puppet::Type::Computer.providers[0])
         Puppet::Type::Computer.expects(:defaultprovider).returns provider_class
         @resource = Puppet::Type::Computer.create(
@@ -18,10 +16,12 @@ describe Puppet.type(:computer), " when checking computer objects" do
         @ensure = Puppet::Type::Computer.attrclass(:ensure).new(:resource => @resource)
     end
   
-    after :each do
+    after do
         computer.clear
-        provider_class = nil
-        Puppet::Type::Computer.provider(nil)
+#        Puppet::Type::Computer.clear
+#        provider_class = nil
+#        Puppet::Type::Computer.provider(nil)
+#        @resource.clear
     end
     
     it "should be able to create a instance" do

-- 
Puppet packaging for Debian