puppet 2.7.11 → 2.7.12

data/spec/unit/provider/confine/feature_spec.rb

@@ -18,24 +18,22 @@ describe Puppet::Provider::Confine::Feature do
 
   describe "when testing values" do
     before do
-      @features = mock 'features'
-      Puppet.stubs(:features).returns @features
       @confine = Puppet::Provider::Confine::Feature.new("myfeature")
       @confine.label = "eh"
     end
 
     it "should use the Puppet features instance to test validity" do
-      @features.expects(:myfeature?)
+      Puppet.features.expects(:myfeature?)
       @confine.valid?
     end
 
     it "should return true if the feature is present" do
-      @features.expects(:myfeature?).returns true
+      Puppet.features.add(:myfeature) do true end
       @confine.pass?("myfeature").should be_true
     end
 
     it "should return false if the value is false" do
-      @features.expects(:myfeature?).returns false
+      Puppet.features.add(:myfeature) do false end
       @confine.pass?("myfeature").should be_false
     end
 

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

@@ -30,7 +30,8 @@ describe provider do
 
     it "should create and return an instance with each parsed line from dpkg-query" do
       pipe = mock 'pipe'
-      pipe.expects(:each).yields @fakeresult
+      pipe.expects(:each).never
+      pipe.expects(:each_line).yields @fakeresult
       provider.expects(:execpipe).yields pipe
 
       asdf = mock 'pkg1'
@@ -41,7 +42,8 @@ describe provider do
 
     it "should warn on and ignore any lines it does not understand" do
       pipe = mock 'pipe'
-      pipe.expects(:each).yields "foobar"
+      pipe.expects(:each).never
+      pipe.expects(:each_line).yields "foobar"
       provider.expects(:execpipe).yields pipe
 
       Puppet.expects(:warning)

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

@@ -4,93 +4,109 @@ require 'spec_helper'
 provider_class = Puppet::Type.type(:package).provider(:gem)
 
 describe provider_class do
-  it "should have an install method" do
-    @provider = provider_class.new
-    @provider.should respond_to(:install)
+  let(:resource) do
+    Puppet::Type.type(:package).new(
+      :name     => 'myresource',
+      :ensure   => :installed
+    )
   end
 
-  describe "when installing" do
-    before do
-      # Create a mock resource
-      @resource = stub 'resource'
-
-      # A catch all; no parameters set
-      @resource.stubs(:[]).returns nil
-
-      # We have to set a name, though
-      @resource.stubs(:[]).with(:name).returns "myresource"
-      @resource.stubs(:[]).with(:ensure).returns :installed
-
-      @provider = provider_class.new
-      @provider.stubs(:resource).returns @resource
-    end
+  let(:provider) do
+    provider = provider_class.new
+    provider.resource = resource
+    provider
+  end
 
+  describe "when installing" do
     it "should use the path to the gem" do
       provider_class.stubs(:command).with(:gemcmd).returns "/my/gem"
-      @provider.expects(:execute).with { |args| args[0] == "/my/gem" }.returns ""
-      @provider.install
+      provider.expects(:execute).with { |args| args[0] == "/my/gem" }.returns ""
+      provider.install
     end
 
     it "should specify that the gem is being installed" do
-      @provider.expects(:execute).with { |args| args[1] == "install" }.returns ""
-      @provider.install
+      provider.expects(:execute).with { |args| args[1] == "install" }.returns ""
+      provider.install
     end
 
     it "should specify that dependencies should be included" do
-      @provider.expects(:execute).with { |args| args[2] == "--include-dependencies" }.returns ""
-      @provider.install
+      provider.expects(:execute).with { |args| args[2] == "--include-dependencies" }.returns ""
+      provider.install
     end
 
     it "should specify that documentation should not be included" do
-      @provider.expects(:execute).with { |args| args[3] == "--no-rdoc" }.returns ""
-      @provider.install
+      provider.expects(:execute).with { |args| args[3] == "--no-rdoc" }.returns ""
+      provider.install
     end
 
     it "should specify that RI should not be included" do
-      @provider.expects(:execute).with { |args| args[4] == "--no-ri" }.returns ""
-      @provider.install
+      provider.expects(:execute).with { |args| args[4] == "--no-ri" }.returns ""
+      provider.install
     end
 
     it "should specify the package name" do
-      @provider.expects(:execute).with { |args| args[5] == "myresource" }.returns ""
-      @provider.install
+      provider.expects(:execute).with { |args| args[5] == "myresource" }.returns ""
+      provider.install
     end
 
     describe "when a source is specified" do
       describe "as a normal file" do
         it "should use the file name instead of the gem name" do
-          @resource.stubs(:[]).with(:source).returns "/my/file"
-          @provider.expects(:execute).with { |args| args[3] == "/my/file" }.returns ""
-          @provider.install
+          resource[:source] = "/my/file"
+          provider.expects(:execute).with { |args| args[3] == "/my/file" }.returns ""
+          provider.install
         end
       end
       describe "as a file url" do
         it "should use the file name instead of the gem name" do
-          @resource.stubs(:[]).with(:source).returns "file:///my/file"
-          @provider.expects(:execute).with { |args| args[3] == "/my/file" }.returns ""
-          @provider.install
+          resource[:source] = "file:///my/file"
+          provider.expects(:execute).with { |args| args[3] == "/my/file" }.returns ""
+          provider.install
         end
       end
       describe "as a puppet url" do
         it "should fail" do
-          @resource.stubs(:[]).with(:source).returns "puppet://my/file"
-          lambda { @provider.install }.should raise_error(Puppet::Error)
+          resource[:source] = "puppet://my/file"
+          lambda { provider.install }.should raise_error(Puppet::Error)
         end
       end
       describe "as a non-file and non-puppet url" do
         it "should treat the source as a gem repository" do
-          @resource.stubs(:[]).with(:source).returns "http://host/my/file"
-          @provider.expects(:execute).with { |args| args[3..5] == ["--source", "http://host/my/file", "myresource"] }.returns ""
-          @provider.install
+          resource[:source] = "http://host/my/file"
+          provider.expects(:execute).with { |args| args[3..5] == ["--source", "http://host/my/file", "myresource"] }.returns ""
+          provider.install
         end
       end
       describe "with an invalid uri" do
         it "should fail" do
           URI.expects(:parse).raises(ArgumentError)
-          @resource.stubs(:[]).with(:source).returns "http:::::uppet:/:/my/file"
-          lambda { @provider.install }.should raise_error(Puppet::Error)
+          resource[:source] = "http:::::uppet:/:/my/file"
+          lambda { provider.install }.should raise_error(Puppet::Error)
         end
       end
     end
   end
+
+  describe "#instances" do
+    before do
+      provider_class.stubs(:command).with(:gemcmd).returns "/my/gem"
+    end
+
+    it "should return an empty array when no gems installed" do
+      provider_class.expects(:execute).with(%w{/my/gem list --local}).returns("\n")
+      provider_class.instances.should == []
+    end
+
+    it "should return ensure values as an array of installed versions" do
+      provider_class.expects(:execute).with(%w{/my/gem list --local}).returns <<-HEREDOC.gsub(/        /, '')
+        systemu (1.2.0)
+        vagrant (0.8.7, 0.6.9)
+      HEREDOC
+
+      provider_class.instances.map {|p| p.properties}.should == [
+        {:ensure => ["1.2.0"],          :provider => :gem, :name => 'systemu'},
+        {:ensure => ["0.8.7", "0.6.9"], :provider => :gem, :name => 'vagrant'}
+      ]
+    end
+  end
 end

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

@@ -0,0 +1,114 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+
+provider_class = Puppet::Type.type(:package).provider(:openbsd)
+
+describe provider_class do
+  subject { provider_class }
+
+  def package(args = {})
+    defaults = { :name => 'bash', :provider => 'openbsd' }
+    Puppet::Type.type(:package).new(defaults.merge(args))
+  end
+
+  before :each do
+    # Stub some provider methods to avoid needing the actual software
+    # installed, so we can test on whatever platform we want.
+    provider_class.stubs(:command).with(:pkginfo).returns('/bin/pkg_info')
+    provider_class.stubs(:command).with(:pkgadd).returns('/bin/pkg_add')
+    provider_class.stubs(:command).with(:pkgdelete).returns('/bin/pkg_delete')
+  end
+
+  context "::instances" do
+    it "should return nil if execution failed" do
+      subject.expects(:execpipe).raises(Puppet::ExecutionFailure, 'wawawa')
+      subject.instances.should be_nil
+    end
+
+    it "should return the empty set if no packages are listed" do
+      subject.expects(:execpipe).with(%w{/bin/pkg_info -a}).yields('')
+      subject.instances.should be_empty
+    end
+
+    it "should return all packages when invoked" do
+      fixture = File.read(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
+    end
+  end
+
+  context "#install" do
+    it "should fail if the resource doesn't have a source" do
+      provider = subject.new(package())
+      expect { provider.install }.
+        to raise_error Puppet::Error, /must specify a package source/
+    end
+
+    it "should install correctly when given a directory-unlike source" do
+      ENV.should_not be_key 'PKG_PATH'
+
+      source = '/whatever.pkg'
+      provider = subject.new(package(:source => source))
+      provider.expects(:pkgadd).with do |name|
+        ENV.should_not be_key 'PKG_PATH'
+        name == source
+      end
+
+      provider.install
+      ENV.should_not be_key 'PKG_PATH'
+    end
+
+    it "should install correctly when given a directory-like source" do
+      ENV.should_not be_key 'PKG_PATH'
+
+      source = '/whatever/'
+      provider = subject.new(package(:source => source))
+      provider.expects(:pkgadd).with do |name|
+        ENV.should be_key 'PKG_PATH'
+        ENV['PKG_PATH'].should == source
+
+        name == provider.resource[:name]
+      end
+
+      provider.install
+      ENV.should_not be_key 'PKG_PATH'
+    end
+  end
+
+  context "#get_version" do
+    it "should return nil if execution fails" do
+      provider = subject.new(package)
+      provider.expects(:execpipe).raises(Puppet::ExecutionFailure, 'wawawa')
+      provider.get_version.should be_nil
+    end
+
+    it "should return the package version if in the output" do
+      fixture = File.read(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'
+    end
+
+    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.get_version.should == ''
+    end
+  end
+
+  context "#query" do
+    it "should return the installed version if present" do
+      fixture = File.read(my_fixture('pkginfo.detail'))
+      provider = subject.new(package(:name => 'bash'))
+      provider.expects(:pkginfo).with('bash').returns(fixture)
+      provider.query.should == { :ensure => '3.1.17' }
+    end
+
+    it "should return nothing if not present" do
+      provider = subject.new(package(:name => 'zsh'))
+      provider.expects(:pkginfo).with('zsh').returns('')
+      provider.query.should be_nil
+    end
+  end
+end

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

@@ -157,7 +157,7 @@ EOF
 
   describe "when fetching a package list" do
     it "should query pacman" do
-      provider.expects(:execpipe).with(["/usr/bin/pacman", ' -Q'])
+      provider.expects(:execpipe).with(["/usr/bin/pacman", '-Q'])
       provider.instances
     end
 

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

@@ -8,10 +8,10 @@ describe provider_class do
   before do
     @resource = Puppet::Resource.new(:package, "fake_package")
     @provider = provider_class.new(@resource)
-    client = stub_everything('client')
-    client.stubs(:call).with('package_releases', 'real_package').returns(["1.3", "1.2.5", "1.2.4"])
-    client.stubs(:call).with('package_releases', 'fake_package').returns([])
-    XMLRPC::Client.stubs(:new2).returns(client)
+    @client = stub_everything('client')
+    @client.stubs(:call).with('package_releases', 'real_package').returns(["1.3", "1.2.5", "1.2.4"])
+    @client.stubs(:call).with('package_releases', 'fake_package').returns([])
+    XMLRPC::Client.stubs(:new2).returns(@client)
   end
 
   describe "parse" do
@@ -86,6 +86,12 @@ describe provider_class do
       @provider.latest.should == nil
     end
 
+    it "should handle a timeout gracefully" do
+      @resource[:name] = "fake_package"
+      @client.stubs(:call).raises(Timeout::Error)
+      lambda { @provider.latest }.should raise_error(Puppet::Error)
+    end
+
   end
 
   describe "install" do

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

@@ -24,7 +24,7 @@ describe provider_class do
     @provider.should respond_to(:install)
   end
 
-  it "should have a latest method" do
+  it "should have an uninstall method" do
     @provider = provider_class.new
     @provider.should respond_to(:uninstall)
   end
@@ -39,17 +39,64 @@ describe provider_class do
     @provider.should respond_to(:latest)
   end
 
-  describe "when installing" do
+  describe "when installing with zypper version >= 1.0" do
+    it "should use a command-line with versioned package'" do
+      @resource.stubs(:should).with(:ensure).returns "1.2.3-4.5.6"
+      @provider.stubs(:zypper_version).returns "1.2.8"
+
+      @provider.expects(:zypper).with('--quiet', :install,
+        '--auto-agree-with-licenses', '--no-confirm', 'mypackage-1.2.3-4.5.6')
+      @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
+      @provider.install
+    end
+
+    it "should use a command-line without versioned package" do
+      @resource.stubs(:should).with(:ensure).returns :latest
+      @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 version = 0.6.104" do
     it "should use a command-line with versioned package'" do
       @resource.stubs(:should).with(:ensure).returns "1.2.3-4.5.6"
-      @provider.expects(:zypper).with('--quiet', :install, '-l', '-y', 'mypackage-1.2.3-4.5.6')
+      @provider.stubs(:zypper_version).returns "0.6.104"
+
+      @provider.expects(:zypper).with('--terse', :install,
+        '--auto-agree-with-licenses', '--no-confirm', 'mypackage-1.2.3-4.5.6')
       @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
       @provider.install
     end
 
     it "should use a command-line without versioned package" do
       @resource.stubs(:should).with(:ensure).returns :latest
-      @provider.expects(:zypper).with('--quiet', :install, '-l', '-y', 'mypackage')
+      @provider.stubs(:zypper_version).returns "0.6.104"
+      @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
+  end
+
+  describe "when installing with zypper version = 0.6.13" do
+    it "should use a command-line with versioned package'" do
+      @resource.stubs(:should).with(:ensure).returns "1.2.3-4.5.6"
+      @provider.stubs(:zypper_version).returns "0.6.13"
+
+      @provider.expects(:zypper).with('--terse', :install,
+        '--no-confirm', 'mypackage-1.2.3-4.5.6')
+      @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
+      @provider.install
+    end
+
+    it "should use a command-line without versioned package" do
+      @resource.stubs(:should).with(:ensure).returns :latest
+      @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
@@ -63,17 +110,12 @@ describe provider_class do
   end
 
   describe "when getting latest version" do
-    it "should return a version string" do
-
-      fake_data = "Loading repository data...
-Reading installed packages...
-S | Repository     | Name                  | Version         | Arch
---+----------------+-----------------------+-----------------+-------
-v | SLES11-Updates | cups                  | 1.1.1           | x86_64
-v | SLES11-Updates | mypackage             | 1.3.9h-8.20.1   | x86_64"
+    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'))
 
-  @provider.expects(:zypper).with("list-updates").returns fake_data
-  @provider.latest.should == "1.3.9h-8.20.1"
+      @resource.stubs(:[]).with(:name).returns "at"
+      @provider.expects(:zypper).with("list-updates").returns fake_data
+      @provider.latest.should == "3.1.8-1069.18.2"
     end
   end