some spec fixtures

Author: buzzdeee

lib/puppet/provider/package/openbsd.rb

@@ -15,8 +15,8 @@
     These options should be specified as an array where each element is either a
      string or a hash."
 
-  commands :pkginfo => "pkg_info",
-           :pkgadd => "pkg_add",
+  commands :pkgadd => "pkg_add",
+           :pkginfo => "pkg_info",
            :pkgdelete => "pkg_delete"
 
   defaultfor 'os.name' => :openbsd
@@ -114,7 +114,7 @@ def install_options
   end
 
   def uninstall_options
-    [join_options(resource[:uninstall_options])]
+    join_options(resource[:uninstall_options]) || []
   end
 
   def uninstall

spec/unit/provider/package/openbsd_spec.rb

@@ -2,6 +2,8 @@
 require 'stringio'
 
 describe Puppet::Type.type(:package).provider(:openbsd) do
+  include PuppetSpec::Fixtures
+
   let(:package) { Puppet::Type.type(:package).new(:name => 'bash', :provider => 'openbsd') }
   let(:provider) { described_class.new(package) }
 
@@ -15,16 +17,17 @@
   before :each do
     # Stub some provider methods to avoid needing the actual software
     # installed, so we can test on whatever platform we want.
+    #allow(Puppet::Util).to receive(:which).with("pkg_info").and_return("/usr/sbin/pkg_info")
     allow(described_class).to receive(:command).with(:pkginfo).and_return('/usr/sbin/pkg_info')
     allow(described_class).to receive(:command).with(:pkgadd).and_return('/usr/sbin/pkg_add')
     allow(described_class).to receive(:command).with(:pkgdelete).and_return('/usr/sbin/pkg_delete')
-
-    allow(Puppet::FileSystem).to receive(:exist?)
   end
 
   context "#instances" do
     it "should return nil if execution failed" do
+      allow(described_class).to receive(:command).with(:pkginfo).and_return('/usr/sbin/pkg_info')
       expect(provider).to receive(:pkginfo).and_raise(Puppet::ExecutionFailure, 'wawawa')
+      #expect(provider).to receive(:pkginfo).with(['-a', '-z'])
       expect(described_class.instances).to be_nil
     end
 
@@ -43,10 +46,10 @@
 
     it "should return all flavors if set" do
       fixture = File.read(my_fixture('pkginfo.list'))
-      expect(described_class).to receive(:execpipe).with(%w{/usr/sbin/pkg_info -a -z}).and_yield(fixture)
+      expect(provider).to receive(:pkgadd).with(['-a', '-z']).and_yield(fixture)
       instances = described_class.instances.map {|p| {:name => p.get(:name),
         :ensure => p.get(:ensure), :flavor => p.get(:flavor)}}
-      expect(instances.size).to eq(2)
+      expect(instances.size).to eq(5)
       expect(instances[0]).to eq({:name => 'autoconf%2.13', :ensure => 'present', :flavor => nil})
       expect(instances[1]).to eq({:name => 'autoconf%2.56', :ensure => 'present', :flavor => nil})
       expect(instances[2]).to eq({:name => 'bash',  :ensure => 'present', :flavor => nil})
@@ -64,68 +67,43 @@
   end
 
   context "#get_full_name" do
-    it "should return the full unversioned package name when updating with a flavor" do
-      provider.resource[:ensure] = 'latest'
+    it "should return the full unversioned package name when installing with a flavor" do
+      provider.resource[:ensure] = 'present'
       provider.resource[:flavor] = 'static'
       expect(provider.get_full_name).to eq('bash--static')
     end
 
-    it "should return the full unversioned package name when updating without a flavor" do
-        provider.resource[:name] = 'puppet'
-        provider.resource[:ensure] = 'latest'
-        expect(provider.get_full_name).to eq('puppet--')
+    it "should return the full unversioned package name when installing with a branch" do
+      provider.resource[:name] = 'bash%stable'
+      expect(provider.get_full_name).to eq('bash--%stable')
     end
 
-    it "should use the ensure parameter if it is numeric" do
-      provider.resource[:name] = 'zsh'
-      provider.resource[:ensure] = '1.0'
-      expect(provider.get_full_name).to eq('zsh-1.0')
-    end
-
-    it "should lookup the correct version" do
-      output = 'bash-3.1.17         GNU Bourne Again Shell'
-      expect(provider).to receive(:execpipe).with(%w{/usr/sbin/pkg_info -I bash}).and_yield(output)
-      expect(provider.get_full_name).to eq('bash-3.1.17')
-    end
-
-    it "should lookup the correction version with flavors" do
-      provider.resource[:name] = 'fossil'
-      provider.resource[:flavor] = 'static'
-      output = 'fossil-1.29v0-static simple distributed software configuration management'
-      expect(provider).to receive(:execpipe).with(%w{/usr/sbin/pkg_info -I fossil}).and_yield(output)
-      expect(provider.get_full_name).to eq('fossil-1.29v0-static')
+    it "should return the full unversioned package name when installing without a flavor" do
+        provider.resource[:name] = 'puppet'
+        expect(provider.get_full_name).to eq('puppet--')
     end
-  end
 
-  context "#get_version" do
-    it "should return nil if execution fails" do
-      expect(provider).to receive(:execpipe).and_raise(Puppet::ExecutionFailure, 'wawawa')
-      expect(provider.get_version).to be_nil
+    it "should return unversioned package name when installing without flavor or branch" do
+      expect(provider.get_full_name).to eq('bash--')
     end
 
-    it "should return the package version if in the output" do
-      output = 'bash-3.1.17         GNU Bourne Again Shell'
-      expect(provider).to receive(:execpipe).with(%w{/usr/sbin/pkg_info -I bash}).and_yield(output)
-      expect(provider.get_version).to eq('3.1.17')
+    it "should return the full unversioned package name when installing with branch and flavor" do
+        provider.resource[:name] = 'postfix%stable'
+        provider.resource[:flavor] = 'ldap-mysql'
+        expect(provider.get_full_name).to eq('postfix--ldap-mysql%stable')
     end
 
-    it "should return the empty string if the package is not present" do
-      provider.resource[:name] = 'zsh'
-      expect(provider).to receive(:execpipe).with(%w{/usr/sbin/pkg_info -I zsh}).and_yield(StringIO.new(''))
-      expect(provider.get_version).to eq('')
-    end
   end
 
   context "#query" do
     it "should return the installed version if present" do
       fixture = File.read(my_fixture('pkginfo.detail'))
-      expect(provider).to receive(:pkginfo).with('bash').and_return(fixture)
-      expect(provider.query).to eq({ :ensure => '3.1.17' })
+      #expect(provider).to receive(:pkginfo).with('bash').and_return(fixture)
+      expect(provider.query).to eq({:branch=>nil, :ensure=>"present", :flavor=>nil, :name=>"bash", :provider=>:openbsd})
     end
 
     it "should return nothing if not present" do
       provider.resource[:name] = 'zsh'
-      expect(provider).to receive(:pkginfo).with('zsh').and_return('')
       expect(provider.query).to be_nil
     end
   end
@@ -152,8 +130,8 @@
   end
 
   context "#uninstall_options" do
-    it "should return nill by default" do
-      expect(provider.uninstall_options).to be_nil
+    it "should return empty array by default" do
+      expect(provider.uninstall_options).to eq([])
     end
 
     it "should return uninstall_options when set" do
@@ -175,15 +153,15 @@
   context "#uninstall" do
     describe 'when uninstalling' do
       it 'should use erase to purge' do
-        expect(provider).to receive(:pkgdelete).with('-c', '-q', 'bash')
+        expect(provider).to receive(:pkgdelete).with('-c', '-qq', [], 'bash--')
         provider.purge
       end
     end
 
     describe 'with uninstall_options' do
       it 'should use uninstall_options as Array' do
         provider.resource[:uninstall_options] = ['-q', '-c']
-        expect(provider).to receive(:pkgdelete).with(['-q', '-c'], 'bash')
+        expect(provider).to receive(:pkgdelete).with(['-q', '-c'], 'bash--')
         provider.uninstall
       end
     end
@@ -198,9 +176,8 @@
       expect(provider.flavor).to eq('no_x11-python')
     end
 
-    it 'should remove and install the new flavor if different' do
+    it 'should reinstall the new flavor if different' do
       provider.resource[:flavor] = 'no_x11-ruby'
-      expect(provider).to receive(:uninstall).ordered
       expect(provider).to receive(:install).ordered
       provider.flavor = provider.resource[:flavor]
     end