puppet 2.6.18 → 2.7.1

data/spec/unit/type/stage_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Type.type(:stage) do
   it "should have a 'name' parameter'" do

data/spec/unit/type/tidy_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/file_bucket/dipper'
 
 tidy = Puppet::Type.type(:tidy)
@@ -110,7 +109,8 @@ describe tidy do
       :b => 0,
       :kb => 1,
       :mb => 2,
-      :gb => 3
+      :gb => 3,
+      :tb => 4
     }
 
     convertors.each do |unit, multiple|

data/spec/unit/type/user_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 user = Puppet::Type.type(:user)
 
@@ -290,14 +289,6 @@ describe user do
       @password.change_to_s("other", "mypass").should_not be_include("mypass")
     end
 
-    it "should redact the password when displaying the old value" do
-      @password.is_to_s("currentpassword").should =~ /^\[old password hash redacted\]$/
-    end
-
-    it "should redact the password when displaying the new value" do
-      @password.should_to_s("newpassword").should =~ /^\[new password hash redacted\]$/
-    end
-
     it "should fail if a ':' is included in the password" do
       lambda { @password.should = "some:thing" }.should raise_error(Puppet::Error)
     end

data/spec/unit/type/vlan_spec.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/env rspec
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Puppet::Type.type(:vlan) do
+
+  it "should have a 'name' parameter'" do
+    Puppet::Type.type(:vlan).new(:name => "200")[:name].should == "200"
+  end
+
+  it "should have a 'device_url' parameter'" do
+    Puppet::Type.type(:vlan).new(:name => "200", :device_url => :device)[:device_url].should == :device
+  end
+
+  it "should be applied on device" do
+    Puppet::Type.type(:vlan).new(:name => "200").should be_appliable_to_device
+  end
+
+  it "should have an ensure property" do
+    Puppet::Type.type(:vlan).attrtype(:ensure).should == :property
+  end
+
+  it "should have a description property" do
+    Puppet::Type.type(:vlan).attrtype(:description).should == :property
+  end
+
+  describe "when validating attribute values" do
+    before do
+      @provider = stub 'provider', :class => Puppet::Type.type(:vlan).defaultprovider, :clear => nil
+      Puppet::Type.type(:vlan).defaultprovider.stubs(:new).returns(@provider)
+    end
+
+    it "should support :present as a value to :ensure" do
+      Puppet::Type.type(:vlan).new(:name => "200", :ensure => :present)
+    end
+
+    it "should support :absent as a value to :ensure" do
+      Puppet::Type.type(:vlan).new(:name => "200", :ensure => :absent)
+    end
+
+    it "should fail if vlan name is not a number" do
+      lambda { Puppet::Type.type(:vlan).new(:name => "notanumber", :ensure => :present) }.should raise_error
+    end
+  end
+end

data/spec/unit/type/whit_spec.rb

@@ -1,11 +1,10 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 whit = Puppet::Type.type(:whit).new(:name => "Foo::Bar")
 
 describe whit do
-  it "should stringify as though it were the class it represents" do
-    whit.to_s.should == "Class[Foo::Bar]"
+  it "should stringify in a way that users will regognise" do
+    whit.to_s.should == "Foo::Bar"
   end
 end

data/spec/unit/type/zfs_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 zfs = Puppet::Type.type(:zfs)
 

data/spec/unit/type/zone_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 zone = Puppet::Type.type(:zone)
 
@@ -57,4 +56,24 @@ describe zone do
     zone.new(:name => "dummy", :path => "/dummy", :ip => "if", :iptype => :exclusive)
   end
 
+  it "should auto-require :dataset entries" do
+    fs = 'random-pool/some-zfs'
+
+    # ick
+    provider = stub 'zfs::provider'
+    provider.stubs(:name).returns(:solaris)
+    Puppet::Type.type(:zfs).stubs(:defaultprovider).returns(provider)
+
+    catalog = Puppet::Resource::Catalog.new
+    zfs_instance = Puppet::Type.type(:zfs).new(:name => fs)
+    catalog.add_resource zfs_instance
+
+    zone_instance = zone.new(:name    => "dummy",
+                             :path    => "/foo",
+                             :ip      => 'en1:1.0.0.0',
+                             :dataset => fs)
+    catalog.add_resource zone_instance
+
+    catalog.relationship_graph.dependencies(zone_instance).should == [zfs_instance]
+  end
 end

data/spec/unit/type/zpool_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 zpool = Puppet::Type.type(:zpool)
 

data/spec/unit/type_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Type do
   it "should include the Cacher module" do
@@ -165,72 +164,6 @@ describe Puppet::Type do
     end
   end
 
-  describe "when creating a provider" do
-    before :each do
-      @type = Puppet::Type.newtype(:provider_test_type)
-    end
-
-    after :each do
-      @type.provider_hash.clear
-    end
-
-    it "should create a subclass of Puppet::Provider for the provider" do
-      provider = @type.provide(:test_provider)
-
-      provider.ancestors.should include(Puppet::Provider)
-    end
-
-    it "should use a parent class if specified" do
-      parent_provider = @type.provide(:parent_provider)
-      child_provider  = @type.provide(:child_provider, :parent => parent_provider)
-
-      child_provider.ancestors.should include(parent_provider)
-    end
-
-    it "should use a parent class if specified by name" do
-      parent_provider = @type.provide(:parent_provider)
-      child_provider  = @type.provide(:child_provider, :parent => :parent_provider)
-
-      child_provider.ancestors.should include(parent_provider)
-    end
-
-    it "should raise an error when the parent class can't be found" do
-      expect {
-        @type.provide(:child_provider, :parent => :parent_provider)
-      }.to raise_error(Puppet::DevError, /Could not find parent provider.+parent_provider/)
-    end
-
-    it "should ensure its type has a 'provider' parameter" do
-      @type.provide(:test_provider)
-
-      @type.parameters.should include(:provider)
-    end
-
-    it "should remove a previously registered provider with the same name" do
-      old_provider = @type.provide(:test_provider)
-      new_provider = @type.provide(:test_provider)
-
-      old_provider.should_not equal(new_provider)
-    end
-
-    it "should register itself as a provider for the type" do
-      provider = @type.provide(:test_provider)
-
-      provider.should == @type.provider(:test_provider)
-    end
-
-    it "should create a provider when a provider with the same name previously failed" do
-      @type.provide(:test_provider) do
-        raise "failed to create this provider"
-      end rescue nil
-
-      provider = @type.provide(:test_provider)
-
-      provider.ancestors.should include(Puppet::Provider)
-      provider.should == @type.provider(:test_provider)
-    end
-  end
-
   describe "when choosing a default provider" do
     it "should choose the provider with the highest specificity" do
       # Make a fake type

data/spec/unit/util/autoload/file_cache_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/util/autoload/file_cache'
 
 class FileCacheTester

data/spec/unit/util/autoload_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/autoload'
 
@@ -52,9 +51,9 @@ describe Puppet::Util::Autoload do
       @autoload.search_directories.should == %w{/one /two /libdir1 /lib/dir/two /third/lib/dir} + $LOAD_PATH
     end
 
-    it "should include in its search path all of the search directories that have a subdirectory matching the autoload path" do
+    it "should include in its search path all of the unique search directories that have a subdirectory matching the autoload path" do
       @autoload = Puppet::Util::Autoload.new("foo", "loaddir")
-      @autoload.expects(:search_directories).returns %w{/one /two /three}
+      @autoload.expects(:search_directories).returns %w{/one /two /three /three}
       FileTest.expects(:directory?).with("/one/loaddir").returns true
       FileTest.expects(:directory?).with("/two/loaddir").returns false
       FileTest.expects(:directory?).with("/three/loaddir").returns true
@@ -104,14 +103,14 @@ describe Puppet::Util::Autoload do
     end
 
     [RuntimeError, LoadError, SyntaxError].each do |error|
-      it "should die an if a #{error.to_s} exception is thrown" do
+      it "should die an if a #{error.to_s} exception is thrown", :'fails_on_ruby_1.9.2' => true do
         Kernel.expects(:require).raises error
 
         lambda { @autoload.loadall }.should raise_error(Puppet::Error)
       end
     end
 
-    it "should require the full path to the file" do
+    it "should require the full path to the file", :'fails_on_ruby_1.9.2' => true do
       Kernel.expects(:require).with("/path/to/file.rb")
 
       @autoload.loadall

data/spec/unit/util/backups_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/backups'
 

data/spec/unit/util/cache_accumulator_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/util/rails/cache_accumulator'
 
 describe Puppet::Util::CacheAccumulator do

data/spec/unit/util/cacher_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/cacher'
 
@@ -43,7 +42,7 @@ describe Puppet::Util::Cacher do
     Puppet::Util::Cacher.singleton_class.ancestors.should be_include(Puppet::Util::Cacher::Expirer)
   end
 
-  it "should support defining cached attributes" do
+  it "should support defining cached attributes", :'fails_on_ruby_1.9.2' => true do
     CacheTest.methods.should be_include("cached_attr")
   end
 

data/spec/unit/util/checksums_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 #  Created by Luke Kanies on 2007-9-22.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 require 'puppet/util/checksums'
 

data/spec/unit/util/command_line_spec.rb

@@ -1,8 +1,7 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
-
+#!/usr/bin/env rspec
+require 'spec_helper'
 
+require 'puppet/face'
 require 'puppet/util/command_line'
 
 describe Puppet::Util::CommandLine do
@@ -99,10 +98,9 @@ describe Puppet::Util::CommandLine do
         Puppet::Util.expects(:which).with('puppet-whatever').returns(nil)
         commandline.expects(:system).never
 
-        commandline.expects(:usage_message).returns("the usage message")
-        commandline.expects(:abort).with{|x| x =~ /the usage message/}.raises("stubbed abort")
-
-        lambda{ commandline.execute }.should raise_error('stubbed abort')
+        expect {
+          commandline.execute
+        }.to have_printed(/Unknown Puppet subcommand 'whatever'/)
       end
     end
   end
@@ -111,6 +109,11 @@ describe Puppet::Util::CommandLine do
       @core_apps = %w{describe filebucket kick queue resource agent cert apply doc master}
       @command_line = Puppet::Util::CommandLine.new("foo", %w{ client --help whatever.pp }, @tty )
     end
+    it "should expose available_subcommands as a class method" do
+      @core_apps.each do |command|
+        @command_line.available_subcommands.should include command
+      end
+    end
     it 'should be able to find all existing commands' do
       @core_apps.each do |command|
         @command_line.available_subcommands.should include command

data/spec/unit/util/constant_inflector_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 #  Created by Luke Kanies on 2008-02-12.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 require 'puppet/util/constant_inflector'
 

data/spec/unit/util/errors_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/errors'
 

data/spec/unit/util/execution_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Util::Execution do
   include Puppet::Util::Execution

data/spec/unit/util/execution_stub_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Util::ExecutionStub do
   it "should use the provided stub code when 'set' is called" do

data/spec/unit/util/feature_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/feature'
 

data/spec/unit/util/file_locking_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/file_locking'
 
@@ -17,11 +16,11 @@ describe Puppet::Util::FileLocking do
     Puppet::Util::FileLocking.should respond_to(:writelock)
   end
 
-  it "should have an instance method for getting a read lock on files" do
+  it "should have an instance method for getting a read lock on files", :'fails_on_ruby_1.9.2' => true do
     FileLocker.new.private_methods.should be_include("readlock")
   end
 
-  it "should have an instance method for getting a write lock on files" do
+  it "should have an instance method for getting a write lock on files", :'fails_on_ruby_1.9.2' => true do
     FileLocker.new.private_methods.should be_include("writelock")
   end