puppet 2.6.18 → 2.7.1

data/spec/unit/provider/confine/feature_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/provider/confine/feature'
 

data/spec/unit/provider/confine/true_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/provider/confine/true'
 

data/spec/unit/provider/confine/variable_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/provider/confine/variable'
 

data/spec/unit/provider/confine_collection_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/provider/confine_collection'
 

data/spec/unit/provider/confine_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/provider/confine'
 

data/spec/unit/provider/confiner_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/provider/confiner'
 

data/spec/unit/provider/exec/posix_spec.rb

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 provider_class = Puppet::Type.type(:exec).provider(:posix)
 

data/spec/unit/provider/exec/shell_spec.rb

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 provider_class = Puppet::Type.type(:exec).provider(:shell)
 

data/spec/unit/provider/group/groupadd_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 provider_class = Puppet::Type.type(:group).provider(:groupadd)
 

data/spec/unit/provider/group/ldap_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 #  Created by Luke Kanies on 2008-3-10.
 #  Copyright (c) 2006. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 provider_class = Puppet::Type.type(:group).provider(:ldap)
 

data/spec/unit/provider/host/parsed_spec.rb

@@ -0,0 +1,197 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+require 'shared_behaviours/all_parsedfile_providers'
+
+require 'puppet_spec/files'
+
+provider_class = Puppet::Type.type(:host).provider(:parsed)
+
+describe provider_class do
+  include PuppetSpec::Files
+
+  before do
+    @host_class = Puppet::Type.type(:host)
+    @provider = @host_class.provider(:parsed)
+    @hostfile = tmpfile('hosts')
+    @provider.any_instance.stubs(:target).returns @hostfile
+  end
+
+  after :each do
+    @provider.initvars
+  end
+
+  def mkhost(args)
+    hostresource = Puppet::Type::Host.new(:name => args[:name])
+    hostresource.stubs(:should).with(:target).returns @hostfile
+
+    # Using setters of provider to build our testobject
+    # Note: We already proved, that in case of host_aliases
+    # the provider setter "host_aliases=(value)" will be
+    # called with the joined array, so we just simulate that
+    host = @provider.new(hostresource)
+    args.each do |property,value|
+      value = value.join(" ") if property == :host_aliases and value.is_a?(Array)
+      host.send("#{property}=", value)
+    end
+    host
+  end
+
+  def genhost(host)
+    @provider.stubs(:filetype).returns(Puppet::Util::FileType::FileTypeRam)
+    File.stubs(:chown)
+    File.stubs(:chmod)
+    Puppet::Util::SUIDManager.stubs(:asuser).yields
+    host.flush
+    @provider.target_object(@hostfile).read
+  end
+
+  describe "when parsing a line with ip and hostname" do
+
+    it "should parse an ipv4 from the first field" do
+      @provider.parse_line("127.0.0.1    localhost")[:ip].should == "127.0.0.1"
+    end
+
+    it "should parse an ipv6 from the first field" do
+      @provider.parse_line("::1     localhost")[:ip].should == "::1"
+    end
+
+    it "should parse the name from the second field" do
+      @provider.parse_line("::1     localhost")[:name].should == "localhost"
+    end
+
+    it "should set an empty comment" do
+      @provider.parse_line("::1     localhost")[:comment].should == ""
+    end
+
+    it "should set host_aliases to :absent" do
+      @provider.parse_line("::1     localhost")[:host_aliases].should == :absent
+    end
+
+  end
+
+  describe "when parsing a line with ip, hostname and comment" do
+    before do
+      @testline = "127.0.0.1   localhost # A comment with a #-char"
+    end
+
+    it "should parse the ip from the first field" do
+      @provider.parse_line(@testline)[:ip].should == "127.0.0.1"
+    end
+
+    it "should parse the hostname from the second field" do
+      @provider.parse_line(@testline)[:name].should == "localhost"
+    end
+
+    it "should parse the comment after the first '#' character" do
+      @provider.parse_line(@testline)[:comment].should == 'A comment with a #-char'
+    end
+
+  end
+
+  describe "when parsing a line with ip, hostname and aliases" do
+
+    it "should parse alias from the third field" do
+      @provider.parse_line("127.0.0.1   localhost   localhost.localdomain")[:host_aliases].should == "localhost.localdomain"
+    end
+
+    it "should parse multiple aliases" do
+      @provider.parse_line("127.0.0.1 host alias1 alias2")[:host_aliases].should == 'alias1 alias2'
+      @provider.parse_line("127.0.0.1 host alias1\talias2")[:host_aliases].should == 'alias1 alias2'
+      @provider.parse_line("127.0.0.1 host alias1\talias2   alias3")[:host_aliases].should == 'alias1 alias2 alias3'
+    end
+
+  end
+
+  describe "when parsing a line with ip, hostname, aliases and comment" do
+
+    before do
+      # Just playing with a few different delimiters
+      @testline = "127.0.0.1\t   host  alias1\talias2   alias3   #   A comment with a #-char"
+    end
+
+    it "should parse the ip from the first field" do
+      @provider.parse_line(@testline)[:ip].should == "127.0.0.1"
+    end
+
+    it "should parse the hostname from the second field" do
+      @provider.parse_line(@testline)[:name].should == "host"
+    end
+
+    it "should parse all host_aliases from the third field" do
+      @provider.parse_line(@testline)[:host_aliases].should == 'alias1 alias2 alias3'
+    end
+
+    it "should parse the comment after the first '#' character" do
+      @provider.parse_line(@testline)[:comment].should == 'A comment with a #-char'
+    end
+
+  end
+
+  describe "when operating on /etc/hosts like files" do
+    it_should_behave_like "all parsedfile providers",
+      provider_class, my_fixtures('valid*')
+
+    it "should be able to generate a simple hostfile entry" do
+      host = mkhost(
+        :name   => 'localhost',
+        :ip     => '127.0.0.1',
+        :ensure => :present
+      )
+      genhost(host).should == "127.0.0.1\tlocalhost\n"
+    end
+
+    it "should be able to generate an entry with one alias" do
+      host = mkhost(
+        :name   => 'localhost.localdomain',
+        :ip     => '127.0.0.1',
+        :host_aliases => 'localhost',
+        :ensure => :present
+      )
+      genhost(host).should == "127.0.0.1\tlocalhost.localdomain\tlocalhost\n"
+    end
+
+    it "should be able to generate an entry with more than one alias" do
+      host = mkhost(
+        :name       => 'host',
+        :ip         => '192.0.0.1',
+        :host_aliases => [ 'a1','a2','a3','a4' ],
+        :ensure     => :present
+      )
+      genhost(host).should == "192.0.0.1\thost\ta1 a2 a3 a4\n"
+    end
+
+    it "should be able to generate a simple hostfile entry with comments" do
+      host = mkhost(
+        :name    => 'localhost',
+        :ip      => '127.0.0.1',
+        :comment => 'Bazinga!',
+        :ensure  => :present
+      )
+      genhost(host).should == "127.0.0.1\tlocalhost\t# Bazinga!\n"
+    end
+
+    it "should be able to generate an entry with one alias and a comment" do
+      host = mkhost(
+        :name   => 'localhost.localdomain',
+        :ip     => '127.0.0.1',
+        :host_aliases => 'localhost',
+        :comment => 'Bazinga!',
+        :ensure => :present
+      )
+      genhost(host).should == "127.0.0.1\tlocalhost.localdomain\tlocalhost\t# Bazinga!\n"
+    end
+
+    it "should be able to generate an entry with more than one alias and a comment" do
+      host = mkhost(
+        :name         => 'host',
+        :ip           => '192.0.0.1',
+        :host_aliases => [ 'a1','a2','a3','a4' ],
+        :comment      => 'Bazinga!',
+        :ensure       => :present
+      )
+      genhost(host).should == "192.0.0.1\thost\ta1 a2 a3 a4\t# Bazinga!\n"
+    end
+
+  end
+
+end

data/spec/unit/provider/interface/cisco_spec.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env rspec
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/provider/interface/cisco'
+
+provider_class = Puppet::Type.type(:interface).provider(:cisco)
+
+describe provider_class do
+  before do
+    @device = stub_everything 'device'
+    @resource = stub("resource", :name => "Fa0/1")
+    @provider = provider_class.new(@device, @resource)
+  end
+
+  it "should have a parent of Puppet::Provider::Cisco" do
+    provider_class.should < Puppet::Provider::Cisco
+  end
+
+  it "should have an instances method" do
+    provider_class.should respond_to(:instances)
+  end
+
+  describe "when looking up instances at prefetch" do
+    before do
+      @device.stubs(:command).yields(@device)
+    end
+
+    it "should delegate to the device interface fetcher" do
+      @device.expects(:interface)
+      provider_class.lookup(@device, "Fa0/1")
+    end
+
+    it "should return the given interface data" do
+      @device.expects(:interface).returns({ :description => "thisone", :mode => :access})
+      provider_class.lookup(@device, "Fa0").should == {:description => "thisone", :mode => :access }
+    end
+
+  end
+
+  describe "when an instance is being flushed" do
+    it "should call the device interface update method with current and past properties" do
+      @instance = provider_class.new(@device, :ensure => :present, :name => "Fa0/1", :description => "myinterface")
+      @instance.description = "newdesc"
+      @instance.resource = @resource
+      @resource.stubs(:[]).with(:name).returns("Fa0/1")
+      device = stub_everything 'device'
+      @instance.stubs(:device).returns(device)
+      device.expects(:command).yields(device)
+      interface = stub 'interface'
+      device.expects(:new_interface).with("Fa0/1").returns(interface)
+      interface.expects(:update).with( {:ensure => :present, :name => "Fa0/1", :description => "myinterface"},
+                                       {:ensure => :present, :name => "Fa0/1", :description => "newdesc"})
+
+      @instance.flush
+    end
+  end
+end

data/spec/unit/provider/ldap_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 #  Created by Luke Kanies on 2008-3-21.
 #  Copyright (c) 2006. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 require 'puppet/provider/ldap'
 

data/spec/unit/provider/macauthorization_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 # Unit testing for the macauthorization provider
 #
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 require 'puppet'
 require 'facter/util/plist'

data/spec/unit/provider/mcx/mcxcontent_spec.rb

@@ -1,24 +1,5 @@
-#! /usr/bin/env ruby
-#--
-# Copyright (C) 2008 Jeffrey J McCune.
-
-# This program and entire repository is free software; you can
-# redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-# Author: Jeff McCune <mccune.jeff@gmail.com>
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 provider_class = Puppet::Type.type(:mcx).provider(:mcxcontent)
 

data/spec/unit/provider/mount/parsed_spec.rb

@@ -1,50 +1,10 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 #  Created by Luke Kanies on 2007-9-12.
 #  Copyright (c) 2006. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-require 'puppet_spec/files'
-require 'puppettest/support/utils'
-require 'puppettest/fileparsing'
-
-module ParsedMountTesting
-  include PuppetTest::Support::Utils
-  include PuppetTest::FileParsing
-  include PuppetSpec::Files
-
-  def fake_fstab
-    os = Facter.value(:operatingsystem)
-    if os == "Solaris"
-      name = "solaris.fstab"
-    elsif os == "FreeBSD"
-      name = "freebsd.fstab"
-    else
-      # Catchall for other fstabs
-      name = "linux.fstab"
-    end
-    fakefile(File::join("data/types/mount", name))
-  end
-
-  def fake_mountoutput
-    os = Facter.value(:operatingsystem)
-    if os == "Darwin"
-      name = "darwin.mount"
-    elsif os == "HP-UX"
-      name = "hpux.mount"
-    elsif os == "Solaris"
-      name = "solaris.mount"
-    elsif os == "AIX"
-      name = "aix.mount"
-    else
-      # Catchall for other fstabs
-      name = "linux.mount"
-    end
-    fakefile(File::join("data/providers/mount/parsed", name))
-  end
-
-end
+require 'spec_helper'
+require 'shared_behaviours/all_parsedfile_providers'
 
 provider_class = Puppet::Type.type(:mount).provider(:parsed)
 
@@ -76,8 +36,10 @@ FSTAB
       lambda{ @provider.to_line(parse[0]) }.should_not raise_error
     end
 
+#   it_should_behave_like "all parsedfile providers",
+#     provider_class, my_fixtures('*.fstab')
 
-    describe "on Solaris", :if => Facter.value(:operatingsystem) == 'Solaris' do
+    describe "on Solaris", :if => Facter.value(:operatingsystem) == 'Solaris', :'fails_on_ruby_1.9.2' => true do
 
       before :each do
         @example_line = "/dev/dsk/c0d0s0 /dev/rdsk/c0d0s0 \t\t    /  \t    ufs     1 no\t-"
@@ -148,11 +110,9 @@ FSTAB
   end
 
   describe "mountinstances" do
-    include ParsedMountTesting
-
     it "should get name from mountoutput found on Solaris" do
       Facter.stubs(:value).with(:operatingsystem).returns 'Solaris'
-      @provider.stubs(:mountcmd).returns(File.read(fake_mountoutput))
+      @provider.stubs(:mountcmd).returns(File.read(my_fixture('solaris.mount')))
       mounts = @provider.mountinstances
       mounts.size.should == 6
       mounts[0].should == { :name => '/', :mounted => :yes }
@@ -165,7 +125,7 @@ FSTAB
 
     it "should get name from mountoutput found on HP-UX" do
       Facter.stubs(:value).with(:operatingsystem).returns 'HP-UX'
-      @provider.stubs(:mountcmd).returns(File.read(fake_mountoutput))
+      @provider.stubs(:mountcmd).returns(File.read(my_fixture('hpux.mount')))
       mounts = @provider.mountinstances
       mounts.size.should == 17
       mounts[0].should == { :name => '/', :mounted => :yes }
@@ -189,7 +149,7 @@ FSTAB
 
     it "should get name from mountoutput found on Darwin" do
       Facter.stubs(:value).with(:operatingsystem).returns 'Darwin'
-      @provider.stubs(:mountcmd).returns(File.read(fake_mountoutput))
+      @provider.stubs(:mountcmd).returns(File.read(my_fixture('darwin.mount')))
       mounts = @provider.mountinstances
       mounts.size.should == 6
       mounts[0].should == { :name => '/', :mounted => :yes }
@@ -202,7 +162,7 @@ FSTAB
 
     it "should get name from mountoutput found on Linux" do
       Facter.stubs(:value).with(:operatingsystem).returns 'Gentoo'
-      @provider.stubs(:mountcmd).returns(File.read(fake_mountoutput))
+      @provider.stubs(:mountcmd).returns(File.read(my_fixture('linux.mount')))
       mounts = @provider.mountinstances
       mounts[0].should == { :name => '/', :mounted => :yes }
       mounts[1].should == { :name => '/lib64/rc/init.d', :mounted => :yes }
@@ -213,7 +173,7 @@ FSTAB
 
     it "should get name from mountoutput found on AIX" do
       Facter.stubs(:value).with(:operatingsystem).returns 'AIX'
-      @provider.stubs(:mountcmd).returns(File.read(fake_mountoutput))
+      @provider.stubs(:mountcmd).returns(File.read(my_fixture('aix.mount')))
       mounts = @provider.mountinstances
       mounts[0].should == { :name => '/', :mounted => :yes }
       mounts[1].should == { :name => '/tmp', :mounted => :yes }
@@ -229,49 +189,64 @@ FSTAB
 
   end
 
-  describe "when prefetching" do
-    include ParsedMountTesting
+  it "should support AIX's paragraph based /etc/filesystems"
 
-    before :each do
-      # Note: we have to stub default_target before creating resources
-      # because it is used by Puppet::Type::Mount.new to populate the
-      # :target property.
-      @provider.stubs(:default_target).returns fake_fstab
+  my_fixtures('*.fstab').each do |fstab|
+    platform = File.basename(fstab, '.fstab')
+    describe "when prefetching on #{platform}" do
+      before :each do
+        if Facter[:operatingsystem] == "Solaris" then
+          platform == 'solaris' or
+            pending "We need to stub the operatingsystem fact at load time, but can't"
+        else
+          platform != 'solaris' or
+            pending "We need to stub the operatingsystem fact at load time, but can't"
+        end
 
-      @res_ghost = Puppet::Type::Mount.new(:name => '/ghost')    # in no fake fstab
-      @res_mounted = Puppet::Type::Mount.new(:name => '/')       # in every fake fstab
-      @res_unmounted = Puppet::Type::Mount.new(:name => '/boot') # in every fake fstab
-      @res_absent = Puppet::Type::Mount.new(:name => '/absent')  # in no fake fstab
+        # Stub the mount output to our fixture.
+        begin
+          mount = my_fixture(platform + '.mount')
+          @provider.stubs(:mountcmd).returns File.read(mount)
+        rescue
+          pending "is #{platform}.mount missing at this point?"
+        end
 
-      # Simulate transaction.rb:prefetch
-      @resource_hash = {}
-      [@res_ghost, @res_mounted, @res_unmounted, @res_absent].each do |resource|
-        @resource_hash[resource.name] = resource
-      end
+        # Note: we have to stub default_target before creating resources
+        # because it is used by Puppet::Type::Mount.new to populate the
+        # :target property.
+        @provider.stubs(:default_target).returns fstab
 
-      @provider.stubs(:mountcmd).returns File.read(fake_mountoutput)
-    end
+        @res_ghost = Puppet::Type::Mount.new(:name => '/ghost')    # in no fake fstab
+        @res_mounted = Puppet::Type::Mount.new(:name => '/')       # in every fake fstab
+        @res_unmounted = Puppet::Type::Mount.new(:name => '/boot') # in every fake fstab
+        @res_absent = Puppet::Type::Mount.new(:name => '/absent')  # in no fake fstab
 
-    it "should set :ensure to :unmounted if found in fstab but not mounted" do
-      @provider.prefetch(@resource_hash)
-      @res_unmounted.provider.get(:ensure).should == :unmounted
-    end
+        # Simulate transaction.rb:prefetch
+        @resource_hash = {}
+        [@res_ghost, @res_mounted, @res_unmounted, @res_absent].each do |resource|
+          @resource_hash[resource.name] = resource
+        end
+      end
 
-    it "should set :ensure to :mounted if found in fstab and mounted" do
-      @provider.prefetch(@resource_hash)
-      @res_ghost.provider.get(:ensure).should == :ghost
-    end
+      it "should set :ensure to :unmounted if found in fstab but not mounted" do
+        @provider.prefetch(@resource_hash)
+        @res_unmounted.provider.get(:ensure).should == :unmounted
+      end
 
-    it "should set :ensure to :ghost if not found in fstab but mounted" do
-      @provider.prefetch(@resource_hash)
-      @res_mounted.provider.get(:ensure).should == :mounted
-    end
+      it "should set :ensure to :ghost if not found in fstab but mounted" do
+        @provider.prefetch(@resource_hash)
+        @res_ghost.provider.get(:ensure).should == :ghost
+      end
 
-    it "should set :ensure to :absent if not found in fstab and not mounted" do
-      @provider.prefetch(@resource_hash)
-      @res_absent.provider.get(:ensure).should == :absent
-    end
+      it "should set :ensure to :mounted if found in fstab and mounted" do
+        @provider.prefetch(@resource_hash)
+        @res_mounted.provider.get(:ensure).should == :mounted
+      end
 
+      it "should set :ensure to :absent if not found in fstab and not mounted" do
+        @provider.prefetch(@resource_hash)
+        @res_absent.provider.get(:ensure).should == :absent
+      end
+    end
   end
-
 end