puppet 2.7.13 → 2.7.14

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

@@ -413,6 +413,25 @@ describe provider_class do
         @provider.should be_need_to_run
       end
 
+      # Workaround for Augeas bug #264 which reports filenames twice
+      it "should handle duplicate /augeas/events/saved filenames" do
+        file = "/etc/hosts"
+
+        @resource[:context] = "/files"
+        @resource[:changes] = ["set #{file}/foo bar"]
+
+        @augeas.stubs(:match).with("/augeas/events/saved").returns(["/augeas/events/saved[1]", "/augeas/events/saved[2]"])
+        @augeas.stubs(:get).with("/augeas/events/saved[1]").returns("/files#{file}")
+        @augeas.stubs(:get).with("/augeas/events/saved[2]").returns("/files#{file}")
+        @augeas.expects(:set).with("/augeas/save", "newfile")
+        @augeas.expects(:close)
+
+        File.expects(:delete).with(file + ".augnew").once()
+
+        @provider.expects(:diff).with("#{file}", "#{file}.augnew").returns("").once()
+        @provider.should be_need_to_run
+      end
+
       it "should fail with an error if saving fails" do
         file = "/etc/hosts"
 

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

@@ -1,50 +1,53 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:exec).provider(:shell)
-
-describe provider_class, :unless => Puppet.features.microsoft_windows? do
-  before :each do
-    @resource = Puppet::Resource.new(:exec, 'foo')
-    @provider = provider_class.new(@resource)
-  end
+describe Puppet::Type.type(:exec).provider(:shell), :unless => Puppet.features.microsoft_windows? do
+  let :resource do Puppet::Resource.new(:exec, 'foo') end
+  let :provider do described_class.new(resource) end
 
   describe "#run" do
     it "should be able to run builtin shell commands" do
-      output, status = @provider.run("if [ 1 = 1 ]; then echo 'blah'; fi")
+      output, status = provider.run("if [ 1 = 1 ]; then echo 'blah'; fi")
       status.exitstatus.should == 0
       output.should == "blah\n"
     end
 
     it "should be able to run commands with single quotes in them" do
-      output, status = @provider.run("echo 'foo  bar'")
+      output, status = provider.run("echo 'foo  bar'")
       status.exitstatus.should == 0
       output.should == "foo  bar\n"
     end
 
     it "should be able to run commands with double quotes in them" do
-      output, status = @provider.run('echo "foo  bar"')
+      output, status = provider.run('echo "foo  bar"')
       status.exitstatus.should == 0
       output.should == "foo  bar\n"
     end
 
     it "should be able to run multiple commands separated by a semicolon" do
-      output, status = @provider.run("echo 'foo' ; echo 'bar'")
+      output, status = provider.run("echo 'foo' ; echo 'bar'")
       status.exitstatus.should == 0
       output.should == "foo\nbar\n"
     end
 
     it "should be able to read values from the environment parameter" do
-      @resource[:environment] = "FOO=bar"
-      output, status = @provider.run("echo $FOO")
+      resource[:environment] = "FOO=bar"
+      output, status = provider.run("echo $FOO")
       status.exitstatus.should == 0
       output.should == "bar\n"
     end
+
+    it "#14060: should interpolate inside the subshell, not outside it" do
+      resource[:environment] = "foo=outer"
+      output, status = provider.run("foo=inner; echo \"foo is $foo\"")
+      status.exitstatus.should == 0
+      output.should == "foo is inner\n"
+    end
   end
 
   describe "#validatecmd" do
     it "should always return true because builtins don't need path or to be fully qualified" do
-      @provider.validatecmd('whateverdoesntmatter').should == true
+      provider.validatecmd('whateverdoesntmatter').should == true
     end
   end
 end

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

@@ -2,18 +2,12 @@
 
 require 'spec_helper'
 
-describe Puppet::Type.type(:exec).provider(:windows) do
+describe Puppet::Type.type(:exec).provider(:windows), :as_platform => :windows do
   include PuppetSpec::Files
 
   let(:resource) { Puppet::Type.type(:exec).new(:title => 'C:\foo', :provider => :windows) }
   let(:provider) { described_class.new(resource) }
 
-  before :each do
-    Facter.stubs(:value).with(:operatingsystem).returns 'Windows'
-    Puppet.features.stubs(:microsoft_windows?).returns(true)
-    Puppet.features.stubs(:posix?).returns(false)
-  end
-
   after :all do
     # This provider may not be suitable on some machines, so we want to reset
     # the default so it isn't used by mistake in future specs.

data/spec/unit/provider/exec_spec.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+require 'puppet/provider/exec'
+
+describe Puppet::Provider::Exec do
+  describe "#extractexe" do
+    it "should return the first element of an array" do
+      subject.extractexe(['one', 'two']).should == 'one'
+    end
+
+    {
+      # double-quoted commands
+      %q{"/has whitespace"}            => "/has whitespace",
+      %q{"/no/whitespace"}             => "/no/whitespace",
+      # singe-quoted commands
+      %q{'/has whitespace'}            => "/has whitespace",
+      %q{'/no/whitespace'}             => "/no/whitespace",
+      # combinations
+      %q{"'/has whitespace'"}          => "'/has whitespace'",
+      %q{'"/has whitespace"'}          => '"/has whitespace"',
+      %q{"/has 'special' characters"}  => "/has 'special' characters",
+      %q{'/has "special" characters'}  => '/has "special" characters',
+      # whitespace split commands
+      %q{/has whitespace}              => "/has",
+      %q{/no/whitespace}               => "/no/whitespace",
+    }.each do |base_command, exe|
+      ['', ' and args', ' "and args"', " 'and args'"].each do |args|
+        command = base_command + args
+        it "should extract #{exe.inspect} from #{command.inspect}" do
+          subject.extractexe(command).should == exe
+        end
+      end
+    end
+  end
+end

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

@@ -155,6 +155,16 @@ describe 'DirectoryService password behavior' do
     Plist::Emit.expects(:save_plist).with(shadow_hash_data, plist_path)
     subject.set_password('jeff', 'uid', sha512_hash)
   end
+
+  it '[#13686] should handle an empty ShadowHashData field in the users plist' do
+    subject.expects(:convert_xml_to_binary).returns(binary_plist)
+    File.expects(:exists?).with(plist_path).once.returns(true)
+    Plist.expects(:parse_xml).returns({'ShadowHashData' => nil})
+    subject.expects(:plutil).with('-convert', 'xml1', '-o', '/dev/stdout', plist_path)
+    subject.expects(:plutil).with('-convert', 'binary1', plist_path)
+    Plist::Emit.expects(:save_plist)
+    subject.set_password('jeff', 'uid', sha512_hash)
+  end
 end
 
 describe '(#4855) directoryservice group resource failure' do

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

@@ -1,5 +1,6 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
+require 'stringio'
 
 provider = Puppet::Type.type(:package).provider(:dpkg)
 
@@ -23,7 +24,7 @@ describe provider do
 
     it "should use dpkg-query" do
       provider.expects(:command).with(:dpkgquery).returns "myquery"
-      provider.expects(:execpipe).with("myquery -W --showformat '${Status} ${Package} ${Version}\\n'").returns @fakeresult
+      provider.expects(:execpipe).with("myquery -W --showformat '${Status} ${Package} ${Version}\\n'").yields StringIO.new(@fakeresult)
 
       provider.instances
     end

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

@@ -87,6 +87,21 @@ describe provider_class do
     end
   end
 
+  describe "#latest" do
+    it "should return a single value for 'latest'" do
+      #gemlist is used for retrieving both local and remote version numbers, and there are cases
+      # (particularly local) where it makes sense for it to return an array.  That doesn't make
+      # sense for '#latest', though.
+      provider.class.expects(:gemlist).with({ :justme => 'myresource'}).returns({
+          :name     => 'myresource',
+          :ensure   => ["3.0"],
+          :provider => :gem,
+          })
+      provider.latest.should == "3.0"
+    end
+  end
+
+
   describe "#instances" do
     before do
       provider_class.stubs(:command).with(:gemcmd).returns "/my/gem"

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

@@ -1,5 +1,6 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
+require 'stringio'
 
 provider_class = Puppet::Type.type(:package).provider(:openbsd)
 
@@ -26,12 +27,12 @@ describe provider_class do
     end
 
     it "should return the empty set if no packages are listed" do
-      subject.expects(:execpipe).with(%w{/bin/pkg_info -a}).yields('')
+      subject.expects(:execpipe).with(%w{/bin/pkg_info -a}).yields(StringIO.new(''))
       subject.instances.should be_empty
     end
 
     it "should return all packages when invoked" do
-      fixture = File.read(my_fixture('pkginfo.list'))
+      fixture = File.new(my_fixture('pkginfo.list'))
       subject.expects(:execpipe).with(%w{/bin/pkg_info -a}).yields(fixture)
       subject.instances.map(&:name).sort.should ==
         %w{bash bzip2 expat gettext libiconv lzo openvpn python vim wget}.sort
@@ -84,7 +85,7 @@ describe provider_class do
     end
 
     it "should return the package version if in the output" do
-      fixture = File.read(my_fixture('pkginfo.list'))
+      fixture = File.new(my_fixture('pkginfo.list'))
       provider = subject.new(package(:name => 'bash'))
       provider.expects(:execpipe).with(%w{/bin/pkg_info -I bash}).yields(fixture)
       provider.get_version.should == '3.1.17'
@@ -92,7 +93,7 @@ describe provider_class do
 
     it "should return the empty string if the package is not present" do
       provider = subject.new(package(:name => 'zsh'))
-      provider.expects(:execpipe).with(%w{/bin/pkg_info -I zsh}).yields('')
+      provider.expects(:execpipe).with(%w{/bin/pkg_info -I zsh}).yields(StringIO.new(''))
       provider.get_version.should == ''
     end
   end

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

@@ -1,5 +1,6 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
+require 'stringio'
 
 provider = Puppet::Type.type(:package).provider(:pacman)
 
@@ -162,7 +163,7 @@ EOF
     end
 
     it "should return installed packages with their versions" do
-      provider.expects(:execpipe).yields("package1 1.23-4\npackage2 2.00\n")
+      provider.expects(:execpipe).yields(StringIO.new("package1 1.23-4\npackage2 2.00\n"))
       packages = provider.instances
 
       packages.length.should == 2
@@ -186,7 +187,7 @@ EOF
     end
 
     it "should warn on invalid input" do
-      provider.expects(:execpipe).yields("blah")
+      provider.expects(:execpipe).yields(StringIO.new("blah"))
       provider.expects(:warning).with("Failed to match line blah")
       provider.instances.should == []
     end

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

@@ -1,14 +1,10 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
-provider = Puppet::Type.type(:package).provider(:pkg)
-
-describe provider do
-  before do
-    @resource = stub 'resource', :[] => "dummy"
-    @provider = provider.new(@resource)
-
-    @fakeresult = "install ok installed dummy 1.0\n"
+describe Puppet::Type.type(:package).provider(:pkg) do
+  before :each do
+    @resource = Puppet::Resource.new(:package, 'dummy', :parameters => {:name => 'dummy', :ensure => :latest})
+    @provider = described_class.new(@resource)
   end
 
   def self.it_should_respond_to(*actions)
@@ -21,8 +17,8 @@ describe provider do
 
   it_should_respond_to :install, :uninstall, :update, :query, :latest
 
-  it "should be versionable" do
-    provider.should_not be_versionable
+  it "should not be versionable" do
+    described_class.should_not be_versionable
   end
 
   it "should use :install to update" do
@@ -30,33 +26,60 @@ describe provider do
     @provider.update
   end
 
-  it "should parse a line correctly" do
-    result = provider.parse_line("dummy 1.0@1.0-1.0 installed ----")
-    result.should == {:name => "dummy", :version => "1.0@1.0-1.0",
-      :ensure => :present, :status => "installed",
-      :provider => :pkg, :error => "ok"}
-  end
+  describe "when calling instances" do
+    it "should correctly parse lines with preferred publisher" do
+      described_class.expects(:pkg).with(:list,'-H').returns File.read(my_fixture('simple'))
+      @instances = described_class.instances.map { |p| Hash.new(:name => p.get(:name), :ensure => p.get(:ensure)) }
+      @instances.size.should == 4
+      @instances[0].should == Hash.new(:name => 'SUNPython', :ensure => :present)
+      @instances[1].should == Hash.new(:name => 'SUNWbind', :ensure => :present)
+      @instances[2].should == Hash.new(:name => 'SUNWdistro-license-copyright', :ensure => :present)
+      @instances[3].should == Hash.new(:name => 'SUNWfppd', :ensure => :present)
+    end
 
-  it "should fail to parse an incorrect line" do
-    result = provider.parse_line("foo")
-    result.should be_nil
-  end
+    it "should correctly parse lines with non preferred publisher" do
+      described_class.expects(:pkg).with(:list,'-H').returns File.read(my_fixture('publisher'))
+      @instances = described_class.instances.map { |p| Hash.new(:name => p.get(:name), :ensure => p.get(:ensure)) }
+      @instances.size.should == 2
+      @instances[0].should == Hash.new(:name => 'SUNWpcre', :ensure => :present)
+      @instances[1].should == Hash.new(:name => 'service/network/ssh', :ensure => :present)
+    end
 
-  it "should fail to list a missing package" do
-    @provider.expects(:pkg).with(:list, "-H", "dummy").returns "1"
-    @provider.query.should == {:status=>"missing", :ensure=>:absent,
-      :name=>"dummy", :error=>"ok"}
+    it "should warn about incorrect lines" do
+      fake_output = File.read(my_fixture('incomplete'))
+      error_line = fake_output.lines[0]
+      described_class.expects(:pkg).with(:list,'-H').returns fake_output
+      described_class.expects(:warning).with "Failed to match 'pkg list' line #{error_line.inspect}"
+      described_class.instances
+    end
   end
 
-  it "should fail to list a package when it can't parse the output line" do
-    @provider.expects(:pkg).with(:list, "-H", "dummy").returns "failed"
-    @provider.query.should == {:status=>"missing", :ensure=>:absent, :name=>"dummy", :error=>"ok"}
-  end
+  describe "when query a package" do
+    it "should find the package" do
+      @provider.stubs(:pkg).with(:list,'-H','dummy').returns File.read(my_fixture('dummy'))
+      @provider.query.should == {
+        :name     => 'dummy',
+        :ensure   => :present,
+        :version  => '2.5.5-0.111',
+        :status   => "installed",
+        :provider => :pkg,
+      }
+    end
+
+    it "should return :absent when the package is not found" do
+      # I dont know what the acutal error looks like, but according to type/pkg.rb we're just
+      # reacting on the Exception anyways
+      @provider.expects(:pkg).with(:list, "-H", "dummy").raises Puppet::ExecutionFailure, 'Not found'
+      @provider.query.should == {:ensure => :absent, :name => "dummy"}
+    end
 
-  it "should list package correctly" do
-    @provider.expects(:pkg).with(:list, "-H", "dummy").returns "dummy 1.0@1.0-1.0 installed ----"
-    @provider.query.should == {:name => "dummy", :version => "1.0@1.0-1.0",
-      :ensure => :present, :status => "installed",
-      :provider => :pkg, :error => "ok"}
+    it "should return :absent when the packageline cannot be parsed" do
+      @provider.stubs(:pkg).with(:list,'-H','dummy').returns File.read(my_fixture('incomplete'))
+      @provider.query.should == {
+        :name   => 'dummy',
+        :ensure => :absent
+      }
+    end
   end
+
 end

data/spec/unit/provider/selmodule_spec.rb

@@ -6,6 +6,7 @@
 # 256 bytes taken from /usr/share/selinux/targeted/nagios.pp on Fedora 9
 
 require 'spec_helper'
+require 'stringio'
 
 provider_class = Puppet::Type.type(:selmodule).provider(:semodule)
 
@@ -19,19 +20,19 @@ describe provider_class do
   describe "exists? method" do
     it "should find a module if it is already loaded" do
       @provider.expects(:command).with(:semodule).returns "/usr/sbin/semodule"
-      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields "bar\t1.2.3\nfoo\t4.4.4\nbang\t1.0.0\n"
+      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields StringIO.new("bar\t1.2.3\nfoo\t4.4.4\nbang\t1.0.0\n")
       @provider.exists?.should == :true
     end
 
     it "should return nil if not loaded" do
       @provider.expects(:command).with(:semodule).returns "/usr/sbin/semodule"
-      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields "bar\t1.2.3\nbang\t1.0.0\n"
+      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields StringIO.new("bar\t1.2.3\nbang\t1.0.0\n")
       @provider.exists?.should be_nil
     end
 
     it "should return nil if no modules are loaded" do
       @provider.expects(:command).with(:semodule).returns "/usr/sbin/semodule"
-      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields ""
+      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields StringIO.new("")
       @provider.exists?.should be_nil
     end
   end
@@ -60,7 +61,13 @@ describe provider_class do
       @provider.expects(:selmodversion_loaded).returns nil
       @provider.syncversion.should == :false
     end
-
   end
 
+  describe "selmodversion_loaded" do
+    it "should return the version of a loaded module" do
+      @provider.expects(:command).with(:semodule).returns "/usr/sbin/semodule"
+      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields StringIO.new("bar\t1.2.3\nfoo\t4.4.4\nbang\t1.0.0\n")
+      @provider.selmodversion_loaded.should == "4.4.4"
+    end
+  end
 end

data/spec/unit/provider/service/redhat_spec.rb

@@ -6,11 +6,9 @@ require 'spec_helper'
 
 provider_class = Puppet::Type.type(:service).provider(:redhat)
 
-describe provider_class do
+describe provider_class, :as_platform => :posix do
 
   before :each do
-    Puppet.features.stubs(:posix?).returns(true)
-    Puppet.features.stubs(:microsoft_windows?).returns(false)
     @class = Puppet::Type.type(:service).provider(:redhat)
     @resource = stub 'resource'
     @resource.stubs(:[]).returns(nil)

data/spec/unit/provider/service/smf_spec.rb

@@ -8,11 +8,9 @@ require 'spec_helper'
 
 provider_class = Puppet::Type.type(:service).provider(:smf)
 
-describe provider_class do
+describe provider_class, :as_platform => :posix do
 
   before(:each) do
-    Puppet.features.stubs(:posix?).returns(true)
-    Puppet.features.stubs(:microsoft_windows?).returns(false)
     # Create a mock resource
     @resource = Puppet::Type.type(:service).new(
       :name => "/system/myservice", :ensure => :running, :enable => :true)