puppet 2.7.18 → 2.7.19

data/spec/unit/parser/lexer_spec.rb

@@ -98,7 +98,7 @@ describe Puppet::Parser::Lexer::TokenList do
 
   it "should fail to add tokens sharing a name with an existing token" do
     @list.add_token :name, "whatever"
-    lambda { @list.add_token :name, "whatever" }.should raise_error(ArgumentError)
+    expect { @list.add_token :name, "whatever" }.to raise_error(ArgumentError)
   end
 
   it "should set provided options on tokens being added" do
@@ -633,11 +633,11 @@ describe "Puppet::Parser::Lexer in the old tests" do
   end
 
   it "should fail usefully" do
-    lambda { tokens_scanned_from('^') }.should raise_error(RuntimeError)
+    expect { tokens_scanned_from('^') }.to raise_error(RuntimeError)
   end
 
   it "should fail if the string is not set" do
-    lambda { @lexer.fullscan }.should raise_error(Puppet::LexError)
+    expect { @lexer.fullscan }.to raise_error(Puppet::LexError)
   end
 
   it "should correctly identify keywords" do
@@ -662,7 +662,7 @@ describe "Puppet::Parser::Lexer in the old tests" do
   end
 
   it "should correctly parse empty strings" do
-    lambda { tokens_scanned_from('$var = ""') }.should_not raise_error
+    expect { tokens_scanned_from('$var = ""') }.to_not raise_error
   end
 
   it "should correctly parse virtual resources" do
@@ -724,7 +724,7 @@ describe "Puppet::Parser::Lexer in the old tests when lexing example files" do
     it "should correctly lex #{file}" do
       lexer = Puppet::Parser::Lexer.new
       lexer.file = file
-      expect { lexer.fullscan }.should_not raise_error
+      expect { lexer.fullscan }.to_not raise_error
     end
   end
 end

data/spec/unit/provider/augeas/augeas_spec.rb

@@ -606,4 +606,82 @@ describe provider_class do
       File.read(target).should =~ /PermitRootLogin no/
     end
   end
+
+  # Run initialisation tests of the real Augeas library to test our open_augeas
+  # method.  This relies on Augeas and ruby-augeas on the host to be
+  # functioning.
+  describe "augeas lib initialisation", :if => Puppet.features.augeas? do
+    # Expect lenses for fstab and hosts
+    it "should have loaded standard files by default" do
+      aug = @provider.open_augeas
+      aug.should_not == nil
+      aug.match("/files/etc/fstab").should == ["/files/etc/fstab"]
+      aug.match("/files/etc/hosts").should == ["/files/etc/hosts"]
+      aug.match("/files/etc/test").should == []
+    end
+
+    # Only the file specified should be loaded
+    it "should load one file if incl/lens used" do
+      @resource[:incl] = "/etc/hosts"
+      @resource[:lens] = "Hosts.lns"
+
+      aug = @provider.open_augeas
+      aug.should_not == nil
+      aug.match("/files/etc/fstab").should == []
+      aug.match("/files/etc/hosts").should == ["/files/etc/hosts"]
+      aug.match("/files/etc/test").should == []
+    end
+
+    it "should also load lenses from load_path" do
+      @resource[:load_path] = my_fixture_dir
+
+      aug = @provider.open_augeas
+      aug.should_not == nil
+      aug.match("/files/etc/fstab").should == ["/files/etc/fstab"]
+      aug.match("/files/etc/hosts").should == ["/files/etc/hosts"]
+      aug.match("/files/etc/test").should == ["/files/etc/test"]
+    end
+
+    it "should also load lenses from pluginsync'd path" do
+      Puppet[:libdir] = my_fixture_dir
+
+      aug = @provider.open_augeas
+      aug.should_not == nil
+      aug.match("/files/etc/fstab").should == ["/files/etc/fstab"]
+      aug.match("/files/etc/hosts").should == ["/files/etc/hosts"]
+      aug.match("/files/etc/test").should == ["/files/etc/test"]
+    end
+  end
+
+  describe "get_load_path" do
+    it "should offer no load_path by default" do
+      @provider.get_load_path(@resource).should == ""
+    end
+
+    it "should offer one path from load_path" do
+      @resource[:load_path] = "/foo"
+      @provider.get_load_path(@resource).should == "/foo"
+    end
+
+    it "should offer multiple colon-separated paths from load_path" do
+      @resource[:load_path] = "/foo:/bar:/baz"
+      @provider.get_load_path(@resource).should == "/foo:/bar:/baz"
+    end
+
+    it "should offer multiple paths in array from load_path" do
+      @resource[:load_path] = ["/foo", "/bar", "/baz"]
+      @provider.get_load_path(@resource).should == "/foo:/bar:/baz"
+    end
+
+    it "should offer pluginsync augeas/lenses subdir" do
+      Puppet[:libdir] = my_fixture_dir
+      @provider.get_load_path(@resource).should == "#{my_fixture_dir}/augeas/lenses"
+    end
+
+    it "should offer both pluginsync and load_path paths" do
+      Puppet[:libdir] = my_fixture_dir
+      @resource[:load_path] = ["/foo", "/bar", "/baz"]
+      @provider.get_load_path(@resource).should == "/foo:/bar:/baz:#{my_fixture_dir}/augeas/lenses"
+    end
+  end
 end

data/spec/unit/provider/nameservice/directoryservice_spec.rb

@@ -31,7 +31,7 @@ require 'spec_helper'
           with([:dseditgroup, '-o', 'edit', '-n', '.', '-a', add, group])
       end
 
-      expect { @provider.set(:members, desired) }.should_not raise_error
+      expect { @provider.set(:members, desired) }.to_not raise_error
     end
   end
 end
@@ -40,9 +40,9 @@ describe 'DirectoryService.single_report' do
   it 'should fail on OS X < 10.4' do
     Puppet::Provider::NameService::DirectoryService.stubs(:get_macosx_version_major).returns("10.3")
 
-    lambda {
+    expect {
       Puppet::Provider::NameService::DirectoryService.single_report('resource_name')
-    }.should raise_error(RuntimeError, "Puppet does not support OS X versions < 10.4")
+    }.to raise_error(RuntimeError, "Puppet does not support OS X versions < 10.4")
   end
 
   it 'should use url data on 10.4' do
@@ -76,9 +76,9 @@ describe 'DirectoryService.get_exec_preamble' do
   it 'should fail on OS X < 10.4' do
     Puppet::Provider::NameService::DirectoryService.stubs(:get_macosx_version_major).returns("10.3")
 
-    lambda {
+    expect {
       Puppet::Provider::NameService::DirectoryService.get_exec_preamble('-list')
-    }.should raise_error(RuntimeError, "Puppet does not support OS X versions < 10.4")
+    }.to raise_error(RuntimeError, "Puppet does not support OS X versions < 10.4")
   end
 
   it 'should use url data on 10.4' do
@@ -140,7 +140,7 @@ describe 'DirectoryService password behavior' do
   it 'should fail if a salted-SHA512 password hash is not passed in >= 10.7' do
     expect {
       subject.set_password('jeff', 'uid', 'badpassword')
-    }.should raise_error(RuntimeError, /OS X 10.7 requires a Salted SHA512 hash password of 136 characters./)
+    }.to raise_error(RuntimeError, /OS X 10.7 requires a Salted SHA512 hash password of 136 characters./)
   end
 
   it 'should convert xml-to-binary and binary-to-xml when setting the pw on >= 10.7' do

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

@@ -36,7 +36,7 @@ describe provider_class do
       Puppet::Util::Execution.expects(:withenv).once.with({:PKG_PATH => path}).yields
       @provider.expects(:pkgadd).once.with("mypackage")
 
-      expect { @provider.install }.should_not raise_error
+      expect { @provider.install }.to_not raise_error
     end
 
     %w{http https ftp}.each do |protocol|
@@ -47,7 +47,7 @@ describe provider_class do
         Puppet::Util::Execution.expects(:withenv).once.with({:PACKAGESITE => path}).yields
         @provider.expects(:pkgadd).once.with('-r', "mypackage")
 
-        expect { @provider.install }.should_not raise_error
+        expect { @provider.install }.to_not raise_error
       end
     end
   end

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

@@ -1,170 +1,237 @@
 require 'spec_helper'
 
-describe 'Puppet::Provider::Package::Msi' do
-  include PuppetSpec::Files
+describe Puppet::Type.type(:package).provider(:msi) do
+  let (:name)        { 'mysql-5.1.58-win-x64' }
+  let (:source)      { 'E:\mysql-5.1.58-win-x64.msi' }
+  let (:productcode) { '{E437FFB6-5C49-4DAC-ABAE-33FF065FE7CC}' }
+  let (:packagecode) { '{5A6FD560-763A-4BC1-9E03-B18DFFB7C72C}' }
+  let (:resource)    {  Puppet::Type.type(:package).new(:name => name, :provider => :msi, :source => source) }
+  let (:provider)    { resource.provider }
+  let (:execute_options) do {:combine => true} end
+
+  def installer(productcodes)
+    installer = mock
+    installer.expects(:UILevel=).with(2)
+
+    installer.stubs(:ProductState).returns(5)
+    installer.stubs(:Products).returns(productcodes)
+    productcodes.each do |guid|
+      installer.stubs(:ProductInfo).with(guid, 'ProductName').returns("name-#{guid}")
+      installer.stubs(:ProductInfo).with(guid, 'PackageCode').returns("package-#{guid}")
+    end
+
+    MsiPackage.stubs(:installer).returns(installer)
+  end
 
   before :each do
-    Puppet::Type.type(:package).stubs(:defaultprovider).returns(Puppet::Type.type(:package).provider(:msi))
-    Puppet[:vardir] = tmpdir('msi')
-    @state_dir = File.join(Puppet[:vardir], 'db', 'package', 'msi')
+    # make sure we never try to execute msiexec
+    provider.expects(:execute).never
+  end
+
+  describe 'provider features' do
+    it { should be_installable }
+    it { should be_uninstallable }
+    it { should be_install_options }
   end
 
-  describe 'when installing' do
-    it 'should create a state file' do
-      resource = Puppet::Type.type(:package).new(
-        :name   => 'mysql-5.1.58-winx64',
-        :source => 'E:\mysql-5.1.58-winx64.msi'
-      )
-      resource.provider.stubs(:execute)
-      resource.provider.install
+  context '::instances' do
+    it 'should return an array of provider instances' do
+      installer([1, 2])
 
-      File.should be_exists File.join(@state_dir, 'mysql-5.1.58-winx64.yml')
+      MsiPackage.map do |pkg|
+        pkg[:name].should        == "name-#{pkg[:productcode]}"
+        pkg[:ensure].should      == :installed
+        pkg[:provider].should    == :msi
+        pkg[:packagecode].should == "package-#{pkg[:productcode]}"
+      end.count.should == 2
     end
 
-    it 'should use the install_options as parameter/value pairs' do
-      resource = Puppet::Type.type(:package).new(
-        :name            => 'mysql-5.1.58-winx64',
-        :source          => 'E:\mysql-5.1.58-winx64.msi',
-        :install_options => { 'INSTALLDIR' => 'C:\mysql-here' }
-      )
+    it 'should return an empty array of none found' do
+      installer([])
 
-      resource.provider.expects(:execute).with('msiexec.exe /qn /norestart /i E:\mysql-5.1.58-winx64.msi INSTALLDIR=C:\mysql-here')
-      resource.provider.install
+      MsiPackage.to_a.size.should == 0
     end
+  end
 
-    it 'should only quote the value when an install_options value has a space in it' do
-      resource = Puppet::Type.type(:package).new(
-        :name            => 'mysql-5.1.58-winx64',
-        :source          => 'E:\mysql-5.1.58-winx64.msi',
-        :install_options => { 'INSTALLDIR' => 'C:\mysql here' }
-      )
+  context '#query' do
+    let (:package) do {
+        :name        => name,
+        :ensure      => :installed,
+        :provider    => :msi,
+        :productcode => productcode,
+        :packagecode => packagecode.upcase
+      }
+    end
 
-      resource.provider.expects(:execute).with('msiexec.exe /qn /norestart /i E:\mysql-5.1.58-winx64.msi INSTALLDIR="C:\mysql here"')
-      resource.provider.install
+    before :each do
+      MsiPackage.stubs(:each).yields(package)
     end
 
-    it 'should escape embedded quotes in install_options values with spaces' do
-      resource = Puppet::Type.type(:package).new(
-        :name            => 'mysql-5.1.58-winx64',
-        :source          => 'E:\mysql-5.1.58-winx64.msi',
-        :install_options => { 'INSTALLDIR' => 'C:\mysql "here"' }
-      )
+    it 'should match package codes case-insensitively' do
+      resource[:name] = packagecode.downcase
+
+      provider.query.should == package
+    end
 
-      resource.provider.expects(:execute).with('msiexec.exe /qn /norestart /i E:\mysql-5.1.58-winx64.msi INSTALLDIR="C:\mysql \"here\""')
-      resource.provider.install
+    it 'should match product name' do
+      resource[:name] = name
+
+      provider.query.should == package
     end
 
-    it 'should not create a state file, if the installation fails' do
-      resource = Puppet::Type.type(:package).new(
-        :name   => 'mysql-5.1.58-winx64',
-        :source => 'E:\mysql-5.1.58-winx64.msi'
-      )
-      resource.provider.stubs(:execute).raises(Puppet::ExecutionFailure.new("Execution of 'msiexec.exe' returned 128: Blargle"))
-      expect { resource.provider.install }.to raise_error(Puppet::ExecutionFailure, /msiexec\.exe/)
+    it 'should return nil if none found' do
+      resource[:name] = 'not going to find it'
 
-      File.should_not be_exists File.join(@state_dir, 'mysql-5.1.58-winx64.yml')
+      provider.query.should be_nil
     end
+  end
+
+  context '#install' do
+    before :each do
+      provider.stubs(:execute)
+    end
+
+    it 'should require the source parameter' do
+      resource = Puppet::Type.type(:package).new(:name => name, :provider => :msi)
 
-    it 'should fail if the source parameter is not set' do
       expect do
-        resource = Puppet::Type.type(:package).new(
-          :name => 'mysql-5.1.58-winx64'
-        ).provider.install
+        resource.provider.install
       end.to raise_error(Puppet::Error, /The source parameter is required when using the MSI provider/)
     end
 
-    it 'should fail if the source parameter is empty' do
+    it 'should install using the source and install_options' do
+      resource[:install_options] = { 'INSTALLDIR' => 'C:\mysql-5.1' }
+
+      provider.expects(:execute).with("msiexec.exe /qn /norestart /i #{source} INSTALLDIR=C:\\mysql-5.1", execute_options)
+      provider.expects(:exit_status).returns(0)
+
+      provider.install
+    end
+
+    it 'should warn if the package requests a reboot' do
+      provider.stubs(:exit_status).returns(194)
+
+      provider.expects(:warning).with('The package requested a reboot to finish the operation.')
+
+      provider.install
+    end
+
+    it 'should warn if reboot initiated' do
+      provider.stubs(:exit_status).returns(1641)
+
+      provider.expects(:warning).with('The package installed successfully and the system is rebooting now.')
+
+      provider.install
+    end
+
+    it 'should warn if reboot required' do
+      provider.stubs(:exit_status).returns(3010)
+
+      provider.expects(:warning).with('The package installed successfully, but the system must be rebooted.')
+
+      provider.install
+    end
+
+    it 'should fail otherwise', :if => Puppet.features.microsoft_windows? do
+      provider.stubs(:execute)
+      provider.stubs(:exit_status).returns(5)
+
       expect do
-        resource = Puppet::Type.type(:package).new(
-          :name   => 'mysql-5.1.58-winx64',
-          :source => ''
-        )
-      end.to raise_error(Puppet::Error, /The source parameter cannot be empty when using the MSI provider/)
+        provider.install
+      end.to raise_error(Puppet::Util::Windows::Error, /Access is denied/)
     end
   end
 
-  describe 'when uninstalling' do
+  context '#uninstall' do
     before :each do
-      FileUtils.mkdir_p(@state_dir)
-      File.open(File.join(@state_dir, 'mysql-5.1.58-winx64.yml'), 'w') {|f| f.puts 'Hello'}
+      resource[:ensure] = :absent
+      provider.set(:productcode => productcode)
+    end
+
+    it 'should require the productcode' do
+      provider.set(:productcode => nil)
+      expect do
+        provider.uninstall
+      end.to raise_error(Puppet::Error, /The productcode property is missing./)
     end
 
-    it 'should remove the state file' do
-      resource = Puppet::Type.type(:package).new(
-        :name   => 'mysql-5.1.58-winx64',
-        :source => 'E:\mysql-5.1.58-winx64.msi'
-      )
-      resource.provider.stubs(:msiexec)
-      resource.provider.uninstall
+    it 'should uninstall using the productcode' do
+      provider.expects(:execute).with("msiexec.exe /qn /norestart /x #{productcode}", execute_options)
+      provider.expects(:exit_status).returns(0)
+
+      provider.uninstall
+    end
+
+    it 'should warn if the package requests a reboot' do
+      provider.stubs(:execute)
+      provider.stubs(:exit_status).returns(194)
+
+      provider.expects(:warning).with('The package requested a reboot to finish the operation.')
+
+      provider.uninstall
+    end
+
+    it 'should warn if reboot initiated' do
+      provider.stubs(:execute)
+      provider.stubs(:exit_status).returns(1641)
+
+      provider.expects(:warning).with('The package uninstalled successfully and the system is rebooting now.')
 
-      File.should_not be_exists File.join(Puppet[:vardir], 'db', 'package', 'msi', 'mysql-5.1.58-winx64.yml')
+      provider.uninstall
     end
 
-    it 'should leave the state file if uninstalling fails' do
-      resource = Puppet::Type.type(:package).new(
-        :name   => 'mysql-5.1.58-winx64',
-        :source => 'E:\mysql-5.1.58-winx64.msi'
-      )
-      resource.provider.stubs(:msiexec).raises(Puppet::ExecutionFailure.new("Execution of 'msiexec.exe' returned 128: Blargle"))
-      expect { resource.provider.uninstall }.to raise_error(Puppet::ExecutionFailure, /msiexec\.exe/)
+    it 'should warn if reboot required' do
+      provider.stubs(:execute)
+      provider.stubs(:exit_status).returns(3010)
 
-      File.should be_exists File.join(@state_dir, 'mysql-5.1.58-winx64.yml')
+      provider.expects(:warning).with('The package uninstalled successfully, but the system must be rebooted.')
+
+      provider.uninstall
     end
 
-    it 'should fail if the source parameter is not set' do
+    it 'should fail otherwise', :if => Puppet.features.microsoft_windows? do
+      provider.stubs(:execute)
+      provider.stubs(:exit_status).returns(5)
+
       expect do
-        resource = Puppet::Type.type(:package).new(
-          :name => 'mysql-5.1.58-winx64'
-        ).provider.install
-      end.to raise_error(Puppet::Error, /The source parameter is required when using the MSI provider/)
+        provider.uninstall
+      end.to raise_error(Puppet::Util::Windows::Error, /Failed to uninstall.*Access is denied/)
     end
+  end
 
+  context '#validate_source' do
     it 'should fail if the source parameter is empty' do
       expect do
-        resource = Puppet::Type.type(:package).new(
-          :name   => 'mysql-5.1.58-winx64',
-          :source => ''
-        )
+        resource[:source] = ''
       end.to raise_error(Puppet::Error, /The source parameter cannot be empty when using the MSI provider/)
     end
-  end
 
-  describe 'when enumerating instances' do
-    it 'should consider the base of the state file name to be the name of the package' do
-      FileUtils.mkdir_p(@state_dir)
-      package_names = ['GoogleChromeStandaloneEnterprise', 'mysql-5.1.58-winx64', 'postgresql-8.3']
+    it 'should accept a source' do
+      resource[:source] = source
+    end
+  end
 
-      package_names.each do |state_file|
-        File.open(File.join(@state_dir, "#{state_file}.yml"), 'w') {|f| f.puts 'Hello'}
-      end
+  context '#install_options' do
+    it 'should return nil by default' do
+      provider.install_options.should be_nil
+    end
 
-      installed_package_names = Puppet::Type.type(:package).provider(:msi).instances.collect {|p| p.name}
+    it 'should use the install_options as parameter/value pairs' do
+      resource[:install_options] = { 'INSTALLDIR' => 'C:\mysql-here' }
 
-      installed_package_names.should =~ package_names
+      provider.install_options.should == ['INSTALLDIR=C:\mysql-here']
     end
-  end
 
-  it 'should consider the package installed if the state file is present' do
-    FileUtils.mkdir_p(@state_dir)
-    File.open(File.join(@state_dir, 'mysql-5.1.58-winx64.yml'), 'w') {|f| f.puts 'Hello'}
-
-    resource = Puppet::Type.type(:package).new(
-      :name   => 'mysql-5.1.58-winx64',
-      :source => 'E:\mysql-5.1.58-winx64.msi'
-    )
+    it 'should only quote the value when an install_options value has a space in it' do
+      resource[:install_options] = { 'INSTALLDIR' => 'C:\mysql here' }
 
-    resource.provider.query.should == {
-      :name   => 'mysql-5.1.58-winx64',
-      :ensure => :installed
-    }
-  end
+      provider.install_options.should == ['INSTALLDIR="C:\mysql here"']
+    end
 
-  it 'should consider the package absent if the state file is missing' do
-    resource = Puppet::Type.type(:package).new(
-      :name   => 'mysql-5.1.58-winx64',
-      :source => 'E:\mysql-5.1.58-winx64.msi'
-    )
+    it 'should escape embedded quotes in install_options values with spaces' do
+      resource[:install_options] = { 'INSTALLDIR' => 'C:\mysql "here"' }
 
-    resource.provider.query.should be_nil
+      provider.install_options.should == ['INSTALLDIR="C:\mysql \"here\""']
+    end
   end
 end