summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorNigel Kersten <nigelk@google.com>2008-12-01 19:10:19 -0800
committerJames Turnbull <james@lovedthanlost.net>2008-12-02 14:22:58 +1100
commit49d4d01e7733f479ecc20cfc3632301ed487c38e (patch)
treead3dbd904f91944b72b8cec58b6e5d91c176b8dc /spec
parent65d6b49950160e45ee4f12b525a1d9878666157f (diff)
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
Diffstat (limited to 'spec')
-rwxr-xr-xspec/unit/type/computer.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/unit/type/computer.rb b/spec/unit/type/computer.rb
index ec3c797b9..ed264d140 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