puppet 4.0.0-x64-mingw32 → 4.1.0-x64-mingw32

data/spec/unit/pops/validator/validator_spec.rb

@@ -111,7 +111,7 @@ describe "validating 4x" do
   end
 
   context 'for reserved words' do
-    ['function', 'private', 'type', 'attr'].each do |word|
+    ['private', 'type', 'attr'].each do |word|
       it "produces an error for the word '#{word}'" do
         source = "$a = #{word}"
         expect(validate(parse(source))).to have_issue(Puppet::Pops::Issues::RESERVED_WORD)

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

@@ -43,14 +43,6 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
     end
 
     describe "#members_insync?" do
-      it "should return false when current is nil" do
-        expect(provider.members_insync?(nil, ['user2'])).to be_falsey
-      end
-
-      it "should return false when should is nil" do
-        expect(provider.members_insync?(['user1'], nil)).to be_falsey
-      end
-
       it "should return true for same lists of members" do
         expect(provider.members_insync?(['user1', 'user2'], ['user1', 'user2'])).to be_truthy
       end
@@ -63,11 +55,31 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
         expect(provider.members_insync?(['user1', 'user2', 'user2'], ['user2', 'user1', 'user1'])).to be_truthy
       end
 
+      it "should return true when current and should members are empty lists" do
+        expect(provider.members_insync?([], [])).to be_truthy
+      end
+
+      # invalid scenarios
+      #it "should return true when current and should members are nil lists" do
+      #it "should return true when current members is nil and should members is empty" do
+
+      it "should return true when current members is empty and should members is nil" do
+        expect(provider.members_insync?([], nil)).to be_truthy
+      end
+
       context "when auth_membership => true" do
         before :each do
           resource[:auth_membership] = true
         end
 
+        it "should return false when current is nil" do
+          expect(provider.members_insync?(nil, ['user2'])).to be_falsey
+        end
+
+        it "should return false when should is nil" do
+          expect(provider.members_insync?(['user1'], nil)).to be_falsey
+        end
+
         it "should return false when current contains different users than should" do
           expect(provider.members_insync?(['user1'], ['user2'])).to be_falsey
         end
@@ -83,6 +95,10 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
         it "should return false when should user(s) are not the only items in the current" do
           expect(provider.members_insync?(['user1', 'user2'], ['user1'])).to be_falsey
         end
+
+        it "should return false when current user(s) is not empty and should is an empty list" do
+          expect(provider.members_insync?(['user1','user2'], [])).to be_falsey
+        end
       end
 
       context "when auth_membership => false" do
@@ -91,6 +107,14 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
           resource[:auth_membership] = false
         end
 
+        it "should return false when current is nil" do
+          expect(provider.members_insync?(nil, ['user2'])).to be_falsey
+        end
+
+        it "should return true when should is nil" do
+          expect(provider.members_insync?(['user1'], nil)).to be_truthy
+        end
+
         it "should return false when current contains different users than should" do
           expect(provider.members_insync?(['user1'], ['user2'])).to be_falsey
         end
@@ -105,7 +129,11 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
 
         it "should return true when current user(s) contains at least the should list" do
           expect(provider.members_insync?(['user1','user2'], ['user1'])).to be_truthy
-          end
+        end
+
+        it "should return true when current user(s) is not empty and should is an empty list" do
+          expect(provider.members_insync?(['user1','user2'], [])).to be_truthy
+        end
 
         it "should return true when current user(s) contains at least the should list, even unordered" do
           expect(provider.members_insync?(['user3','user1','user2'], ['user2','user1'])).to be_truthy
@@ -185,6 +213,18 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
         /Cannot create group if user 'testers' exists./ )
     end
 
+    it "should fail with an actionable message when trying to create an active directory group" do
+      resource[:name] = 'DOMAIN\testdomaingroup'
+      Puppet::Util::Windows::ADSI::User.expects(:exists?).with(resource[:name]).returns(false)
+      connection.expects(:Create)
+      connection.expects(:SetInfo).raises( WIN32OLERuntimeError.new("(in OLE method `SetInfo': )\n    OLE error code:8007089A in Active Directory\n      The specified username is invalid.\r\n\n    HRESULT error code:0x80020009\n      Exception occurred."))
+
+      expect{ provider.create }.to raise_error(
+                                       Puppet::Error,
+                                       /not able to create\/delete domain groups/
+                                   )
+    end
+
     it 'should commit a newly created group' do
       provider.group.expects( :commit )
 
@@ -207,6 +247,14 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
     provider.delete
   end
 
+  it 'should not run commit on a deleted group' do
+    connection.expects(:Delete).with('group', 'testers')
+    connection.expects(:SetInfo).never
+
+    provider.delete
+    provider.flush
+  end
+
   it "should report the group's SID as gid" do
     Puppet::Util::Windows::SID.expects(:name_to_sid).with('testers').returns('S-1-5-32-547')
     expect(provider.gid).to eq('S-1-5-32-547')

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

@@ -8,6 +8,9 @@ require 'shared_behaviours/all_parsedfile_providers'
 # restore Solaris spec tests.
 
 describe Puppet::Type.type(:mount).provider(:parsed), :unless => Puppet.features.microsoft_windows? do
+  before :each do
+    Facter.clear
+  end
 
   let :vfstab_sample do
     "/dev/dsk/c0d0s0 /dev/rdsk/c0d0s0 \t\t    /  \t    ufs     1 no\t-"
@@ -26,6 +29,11 @@ describe Puppet::Type.type(:mount).provider(:parsed), :unless => Puppet.features
     end
   end
 
+  it "should default to /etc/vfstab on Solaris" do
+    pending "This test only works on AIX" unless Facter.value(:osfamily) == 'AIX'
+    expect(described_class.default_target).to eq('/etc/filesystems')
+  end
+
   it "should default to /etc/fstab on anything else" do
     if Facter.value(:osfamily) == 'Solaris'
       skip("This test only does not work on Solaris")
@@ -171,10 +179,14 @@ FSTAB
       described_class.stubs(:mountcmd).returns(File.read(my_fixture('aix.mount')))
       mounts = described_class.mountinstances
       expect(mounts[0]).to eq({ :name => '/', :mounted => :yes })
-      expect(mounts[1]).to eq({ :name => '/tmp', :mounted => :yes })
-      expect(mounts[2]).to eq({ :name => '/home', :mounted => :yes })
-      expect(mounts[3]).to eq({ :name => '/usr', :mounted => :yes })
-      expect(mounts[4]).to eq({ :name => '/usr/code', :mounted => :yes })
+      expect(mounts[1]).to eq({ :name => '/usr', :mounted => :yes })
+      expect(mounts[2]).to eq({ :name => '/var', :mounted => :yes })
+      expect(mounts[3]).to eq({ :name => '/tmp', :mounted => :yes })
+      expect(mounts[4]).to eq({ :name => '/home', :mounted => :yes })
+      expect(mounts[5]).to eq({ :name => '/admin', :mounted => :yes })
+      expect(mounts[6]).to eq({ :name => '/proc', :mounted => :yes })
+      expect(mounts[7]).to eq({ :name => '/opt', :mounted => :yes })
+      expect(mounts[8]).to eq({ :name => '/srv/aix', :mounted => :yes })
     end
 
     it "should raise an error if a line is not understandable" do
@@ -184,7 +196,21 @@ FSTAB
 
   end
 
-  it "should support AIX's paragraph based /etc/filesystems"
+  it "should support AIX's paragraph based /etc/filesystems" do
+    pending "This test only works on AIX" unless Facter.value(:osfamily) == 'AIX'
+    Facter.stubs(:value).with(:osfamily).returns 'AIX'
+    described_class.stubs(:default_target).returns my_fixture('aix.filesystems')
+    described_class.stubs(:mountcmd).returns File.read(my_fixture('aix.mount'))
+    instances = described_class.instances
+    expect(instances[0].name).to eq("/")
+    expect(instances[0].device).to eq("/dev/hd4")
+    expect(instances[0].fstype).to eq("jfs2")
+    expect(instances[0].options).to eq("check=false,free=true,log=NULL,mount=automatic,quota=no,type=bootfs,vol=root")
+    expect(instances[11].name).to eq("/srv/aix")
+    expect(instances[11].device).to eq("mynode")
+    expect(instances[11].fstype).to eq("nfs")
+    expect(instances[11].options).to eq("vers=2,account=false,log=NULL,mount=true")
+  end
 
   my_fixtures('*.fstab').each do |fstab|
     platform = File.basename(fstab, '.fstab')

data/spec/unit/provider/package/apt_spec.rb

@@ -19,6 +19,11 @@ describe provider_class do
     provider
   end
 
+  it "should be the default provider on :osfamily => Debian" do
+    Facter.expects(:value).with(:osfamily).returns("Debian")
+    expect(described_class.default?).to be_truthy
+  end
+
   it "should be versionable" do
     expect(provider_class).to be_versionable
   end

data/spec/unit/provider/package/pip_spec.rb

@@ -193,6 +193,15 @@ describe provider_class do
       @provider.install
     end
 
+    it "should handle install options" do
+      @resource[:ensure] = :installed
+      @resource[:source] = nil
+      @resource[:install_options] = [{"--timeout" => "10"}, "--no-index"]
+      @provider.expects(:lazy_pip).
+        with("install", "-q", "--timeout=10", "--no-index", "fake_package")
+      @provider.install
+    end
+
   end
 
   describe "uninstall" do

data/spec/unit/provider/package/pkgng_spec.rb

@@ -0,0 +1,172 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/provider/package/pkgng'
+
+provider_class = Puppet::Type.type(:package).provider(:pkgng)
+
+describe provider_class do
+  let(:name) { 'bash' }
+  let(:installed_name) { 'zsh' }
+  let(:pkgng) { 'pkgng' }
+
+  let(:resource) do
+    # When bash is not present
+    Puppet::Type.type(:package).new(:name => name, :provider => pkgng)
+  end
+
+  let(:installed_resource) do
+    # When zsh is present
+    Puppet::Type.type(:package).new(:name => installed_name, :provider => pkgng)
+  end
+
+  let(:latest_resource) do
+    # When curl is installed but not the latest
+    Puppet::Type.type(:package).new(:name => 'ftp/curl', :provider => pkgng, :ensure => latest)
+  end
+
+  let (:provider) { resource.provider }
+  let (:installed_provider) { installed_resource.provider }
+
+  def run_in_catalog(*resources)
+    catalog = Puppet::Resource::Catalog.new
+    catalog.host_config = false
+    resources.each do |resource|
+      #resource.expects(:err).never
+      catalog.add_resource(resource)
+    end
+    catalog.apply
+  end
+
+  before do
+    provider_class.stubs(:command).with(:pkg) { '/usr/local/sbin/pkg' }
+
+    info = File.read(my_fixture('pkg.info'))
+    provider_class.stubs(:get_query).returns(info)
+
+    version_list = File.read(my_fixture('pkg.version'))
+    provider_class.stubs(:get_version_list).returns(version_list)
+  end
+
+  context "#instances" do
+    it "should return the empty set if no packages are listed" do
+      provider_class.stubs(:get_query).returns('')
+      provider_class.stubs(:get_version_list).returns('')
+      expect(provider_class.instances).to be_empty
+    end
+
+    it "should return all packages when invoked" do
+      expect(provider_class.instances.map(&:name).sort).to eq(
+        %w{ca_root_nss curl nmap pkg gnupg mcollective zsh tac_plus}.sort)
+    end
+
+    it "should set latest to current version when no upgrade available" do
+      nmap = provider_class.instances.find {|i| i.properties[:origin] == 'security/nmap' }
+
+      expect(nmap.properties[:version]).to eq(nmap.properties[:latest])
+    end
+
+    describe "version" do
+      it "should retrieve the correct version of the current package" do
+        zsh = provider_class.instances.find {|i| i.properties[:origin] == 'shells/zsh' }
+        expect( zsh.properties[:version]).to eq('5.0.2_1')
+      end
+    end
+  end
+
+  context "#install" do
+    it "should call pkg with the specified package version given an origin for package name" do
+      resource = Puppet::Type.type(:package).new(
+        :name     => 'ftp/curl',
+        :provider => :pkgng,
+        :ensure   => '7.33.1'
+      )
+      resource.provider.expects(:pkg) do |arg|
+        arg.should include('curl-7.33.1')
+      end
+      resource.provider.install
+    end
+
+    it "should call pkg with the specified package version" do
+      resource = Puppet::Type.type(:package).new(
+        :name     => 'curl',
+        :provider => :pkgng,
+        :ensure   => '7.33.1'
+      )
+      resource.provider.expects(:pkg) do |arg|
+        arg.should include('curl-7.33.1')
+      end
+      resource.provider.install
+    end
+
+    it "should call pkg with the specified package repo" do
+      resource = Puppet::Type.type(:package).new(
+        :name     => 'curl',
+        :provider => :pkgng,
+        :source   => 'urn:freebsd:repo:FreeBSD'
+      )
+      resource.provider.expects(:pkg) do |arg|
+        arg.should include('FreeBSD')
+      end
+      resource.provider.install
+    end
+  end
+
+  context "#query" do
+    it "should return the installed version if present" do
+      provider_class.prefetch({installed_name => installed_resource})
+      expect(installed_provider.query).to eq({:version=>'5.0.2_1'})
+    end
+
+    it "should return nil if not present" do
+      fixture = File.read(my_fixture('pkg.query_absent'))
+      provider_class.stubs(:get_resource_info).with('bash').returns(fixture)
+      expect(provider.query).to equal(nil)
+    end
+  end
+
+  describe "latest" do
+    it "should retrieve the correct version of the latest package" do
+      provider_class.prefetch( { installed_name => installed_resource })
+      expect(installed_provider.latest).not_to be_nil
+    end
+
+    it "should set latest to newer package version when available" do
+      instances = provider_class.instances
+      curl = instances.find {|i| i.properties[:origin] == 'ftp/curl' }
+      expect(curl.properties[:latest]).to eq('7.33.0_2')
+    end
+
+    it "should call update to upgrade the version" do
+      resource = Puppet::Type.type(:package).new(
+        :name     => 'ftp/curl',
+        :provider => pkgng,
+        :ensure   => :latest
+      )
+
+      resource.provider.expects(:update)
+
+      resource.property(:ensure).sync
+    end
+  end
+
+  describe "get_latest_version" do
+    it "should rereturn nil when the current package is the latest" do
+      nmap_latest_version = provider_class.get_latest_version('security/nmap')
+      expect(nmap_latest_version).to be_nil
+    end
+
+    it "should match the package name exactly" do
+      bash_comp_latest_version = provider_class.get_latest_version('shells/bash-completion')
+      expect(bash_comp_latest_version).to eq('2.1_3')
+    end
+  end
+
+  describe "confine" do
+    context "on FreeBSD" do
+      it "should be the default provider" do
+        Facter.expects(:value).with(:operatingsystem).at_least_once.returns :freebsd
+        expect(provider_class).to be_default
+      end
+    end
+  end
+end

data/spec/unit/provider/package/windows/exe_package_spec.rb

@@ -34,7 +34,6 @@ describe Puppet::Provider::Package::Windows::ExePackage do
     {
       'DisplayName'      => ['My App', ''],
       'UninstallString'  => ['E:\uninstall.exe', ''],
-      'SystemComponent'  => [nil, 1],
       'WindowsInstaller' => [nil, 1],
       'ParentKeyName'    => [nil, 'Uber Product'],
       'Security Update'  => [nil, 'KB890830'],

data/spec/unit/provider/package/windows/msi_package_spec.rb

@@ -48,7 +48,6 @@ describe Puppet::Provider::Package::Windows::MsiPackage do
 
     {
       'DisplayName'      => ['My App', ''],
-      'SystemComponent'  => [nil, 1],
       'WindowsInstaller' => [1, nil],
     }.each_pair do |k, arr|
       it "should accept '#{k}' with value '#{arr[0]}'" do

data/spec/unit/provider/package/zypper_spec.rb

@@ -80,7 +80,7 @@ describe provider_class do
       @resource.stubs(:should).with(:ensure).returns :latest
       @resource.stubs(:allow_virtual?).returns false
       @provider.stubs(:zypper_version).returns "0.6.104"
-      @provider.expects(:zypper).with('--terse', :install, '--auto-agree-with-licenses', '--no-confirm', '--name', 'mypackage')
+      @provider.expects(:zypper).with('--terse', :install, '--auto-agree-with-licenses', '--no-confirm', 'mypackage')
       @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
       @provider.install
     end
@@ -101,7 +101,7 @@ describe provider_class do
       @resource.stubs(:should).with(:ensure).returns :latest
       @resource.stubs(:allow_virtual?).returns false
       @provider.stubs(:zypper_version).returns "0.6.13"
-      @provider.expects(:zypper).with('--terse', :install, '--no-confirm', '--name', 'mypackage')
+      @provider.expects(:zypper).with('--terse', :install, '--no-confirm', 'mypackage')
       @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
       @provider.install
     end
@@ -115,22 +115,53 @@ describe provider_class do
   end
 
   describe "when getting latest version" do
-    it "should return a version string with valid list-updates data from SLES11sp1" do
-      fake_data = File.read(my_fixture('zypper-list-updates-SLES11sp1.out'))
+    after do described_class.reset! end
+    context "when the package has available update" do
+      it "should return a version string with valid list-updates data from SLES11sp1" do
+        fake_data = File.read(my_fixture('zypper-list-updates-SLES11sp1.out'))
+        @resource.stubs(:[]).with(:name).returns "at"
+        described_class.expects(:zypper).with("list-updates").returns fake_data
+        expect(@provider.latest).to eq("3.1.8-1069.18.2")
+      end
+    end
+
+    context "when the package is in the latest version" do
+      it "should return nil with valid list-updates data from SLES11sp1" do
+        fake_data = File.read(my_fixture('zypper-list-updates-SLES11sp1.out'))
+        @resource.stubs(:[]).with(:name).returns "zypper-log"
+        described_class.expects(:zypper).with("list-updates").returns fake_data
+        expect(@provider.latest).to eq(nil)
+      end
+    end
 
-      @resource.stubs(:[]).with(:name).returns "at"
-      @provider.expects(:zypper).with("list-updates").returns fake_data
-      expect(@provider.latest).to eq("3.1.8-1069.18.2")
+    context "when there are no updates available" do
+      it "should return nil" do
+        fake_data_empty = File.read(my_fixture('zypper-list-updates-empty.out'))
+        @resource.stubs(:[]).with(:name).returns "at"
+        described_class.expects(:zypper).with("list-updates").returns fake_data_empty
+        expect(@provider.latest).to eq(nil)
+      end
     end
   end
 
-  it "should install a virtual package" do
-    @resource.stubs(:should).with(:ensure).returns :installed
-    @resource.stubs(:allow_virtual?).returns true
-    @provider.stubs(:zypper_version).returns "0.6.13"
-    @provider.expects(:zypper).with('--terse', :install, '--no-confirm', 'mypackage')
-    @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
-    @provider.install
+  describe "should install a virtual package" do
+    it "when zypper version = 0.6.13" do
+      @resource.stubs(:should).with(:ensure).returns :installed
+      @resource.stubs(:allow_virtual?).returns true
+      @provider.stubs(:zypper_version).returns "0.6.13"
+      @provider.expects(:zypper).with('--terse', :install, '--no-confirm', 'mypackage')
+      @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
+      @provider.install
+    end
+
+    it "when zypper version >= 1.0.0" do
+      @resource.stubs(:should).with(:ensure).returns :installed
+      @resource.stubs(:allow_virtual?).returns true
+      @provider.stubs(:zypper_version).returns "1.2.8"
+      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', 'mypackage')
+      @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
+      @provider.install
+    end
   end
 
   describe "when installing with zypper install options" do
@@ -141,8 +172,8 @@ describe provider_class do
       @resource.stubs(:allow_virtual?).returns false
       @provider.stubs(:zypper_version).returns "1.2.8"
 
-      @provider.expects(:zypper).with('--quiet', :install,
-        '--auto-agree-with-licenses', '--no-confirm', '--no-gpg-check', '-p=/vagrant/files/localrepo/', 'php5-5.4.10-4.5.6')
+      @provider.expects(:zypper).with('--quiet', '--no-gpg-check', :install,
+        '--auto-agree-with-licenses', '--no-confirm', '-p=/vagrant/files/localrepo/', 'php5-5.4.10-4.5.6')
       @provider.expects(:query).returns "php5 0 5.4.10 4.5.6 x86_64"
       @provider.install
     end
@@ -154,7 +185,7 @@ describe provider_class do
       @resource.stubs(:allow_virtual?).returns false
 
       @provider.stubs(:zypper_version).returns '1.2.8'
-      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--name', '--a=foo', '--b="quoted bar"', 'vim')
+      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--a=foo', '--b="quoted bar"', '--name', 'vim')
       @provider.expects(:query).returns 'package vim is not installed'
       @provider.install
     end
@@ -166,7 +197,7 @@ describe provider_class do
       @resource.stubs(:allow_virtual?).returns false
 
       @provider.stubs(:zypper_version).returns '1.2.8'
-      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--name', '--a', '--b', '--c', 'vim')
+      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--a', '--b', '--c', '--name', 'vim')
       @provider.expects(:query).returns 'package vim is not installed'
       @provider.install
     end
@@ -178,7 +209,7 @@ describe provider_class do
       @resource.stubs(:allow_virtual?).returns false
 
       @provider.stubs(:zypper_version).returns '1.2.8'
-      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--name', '--a --b --c', 'vim')
+      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--a --b --c', '--name', 'vim')
       @provider.expects(:query).returns 'package vim is not installed'
       @provider.install
     end