puppet 4.3.0 → 4.4.0

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

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:package).provider(:pip3)
-osfamilies = { ['All', nil] => 'pip3' }
+osfamilies = { ['All', nil] => ['pip3'] }
 
 describe provider_class do
 
@@ -33,30 +33,38 @@ describe provider_class do
 
   describe "cmd" do
 
-    it "should return pip3 by default" do
+    it "should return #{osfamilies[['All', nil]][0]} by default" do
       Facter.stubs(:value).with(:osfamily).returns("Not RedHat")
-      expect(provider_class.cmd).to eq('pip3')
+      expect(provider_class.cmd[0]).to eq(osfamilies[['All', nil]][0])
     end
-
   end
 
   describe "instances" do
 
-    osfamilies.each do |osfamily, pip_cmd|
-      it "should return an array on #{osfamily} when #{pip_cmd} is present" do
-        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
-        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
-        provider_class.expects(:which).with(pip_cmd).returns("/fake/bin/pip3")
-        p = stub("process")
-        p.expects(:collect).yields("real_package==1.2.5")
-        provider_class.expects(:execpipe).with("/fake/bin/pip3 freeze").yields(p)
-        provider_class.instances
-      end
-
-      it "should return an empty array on #{osfamily} when #{pip_cmd} is missing" do
+    osfamilies.each do |osfamily, pip_cmds|
+        it "should return an array on #{osfamily} when #{pip_cmds.join(' or ')} is present" do
+          Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
+          Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+          pip_cmds.each do |pip_cmd|
+            pip_cmds.each do |cmd|
+              unless cmd == pip_cmd
+                provider_class.expects(:which).with(cmd).returns(nil)
+              end
+            end
+            provider_class.expects(:which).with(pip_cmd).returns("/fake/bin/#{pip_cmd}")
+            p = stub("process")
+            p.expects(:collect).yields("real_package==1.2.5")
+            provider_class.expects(:execpipe).with("/fake/bin/#{pip_cmd} freeze").yields(p)
+            provider_class.instances
+          end
+        end
+
+      it "should return an empty array on #{osfamily} when #{pip_cmds.join(' and ')} is missing" do
         Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
         Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
-        provider_class.expects(:which).with(pip_cmd).returns nil
+        pip_cmds.each do |pip_cmd|
+          provider_class.expects(:which).with(pip_cmd).returns nil
+        end
         expect(provider_class.instances).to eq([])
       end
     end
@@ -224,32 +232,42 @@ describe provider_class do
       @provider.method(:lazy_pip).call "freeze"
     end
 
-    osfamilies.each do |osfamily, pip_cmd|
-      it "should retry on #{osfamily} if #{pip_cmd} has not yet been found" do
-        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
-        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
-        @provider.expects(:pip).twice.with('freeze').raises(NoMethodError).then.returns(nil)
-        @provider.expects(:which).with(pip_cmd).returns("/fake/bin/pip3")
-        @provider.method(:lazy_pip).call "freeze"
-      end
-
-      it "should fail on #{osfamily} if #{pip_cmd} is missing" do
-        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
-        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
-        @provider.expects(:pip).with('freeze').raises(NoMethodError)
-        @provider.expects(:which).with(pip_cmd).returns(nil)
-        expect { @provider.method(:lazy_pip).call("freeze") }.to raise_error(NoMethodError)
-      end
-
-      it "should output a useful error message on #{osfamily} if #{pip_cmd} is missing" do
-        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
-        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
-        @provider.expects(:pip).with('freeze').raises(NoMethodError)
-        @provider.expects(:which).with(pip_cmd).returns(nil)
-        expect { @provider.method(:lazy_pip).call("freeze") }.
-          to raise_error(NoMethodError, "Could not locate the #{pip_cmd} command.")
+    osfamilies.each do |osfamily, pip_cmds|
+      pip_cmds.each do |pip_cmd|
+        it "should retry on #{osfamily} if #{pip_cmd} has not yet been found" do
+          Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
+          Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+          @provider.expects(:pip).twice.with('freeze').raises(NoMethodError).then.returns(nil)
+          pip_cmds.each do |cmd|
+            unless cmd == pip_cmd
+              @provider.expects(:which).with(cmd).returns(nil)
+            end
+          end
+          @provider.expects(:which).with(pip_cmd).returns("/fake/bin/#{pip_cmd}")
+          @provider.method(:lazy_pip).call "freeze"
+        end
+
+        it "should fail on #{osfamily} if #{pip_cmd} is missing" do
+          Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
+          Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+          @provider.expects(:pip).with('freeze').raises(NoMethodError)
+          pip_cmds.each do |pip_cmd|
+            @provider.expects(:which).with(pip_cmd).returns(nil)
+          end
+          expect { @provider.method(:lazy_pip).call("freeze") }.to raise_error(NoMethodError)
+        end
+
+        it "should output a useful error message on #{osfamily} if #{pip_cmd} is missing" do
+          Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
+          Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+          @provider.expects(:pip).with('freeze').raises(NoMethodError)
+          pip_cmds.each do |pip_cmd|
+            @provider.expects(:which).with(pip_cmd).returns(nil)
+          end
+          expect { @provider.method(:lazy_pip).call("freeze") }.
+            to raise_error(NoMethodError, "Could not locate command #{pip_cmd}.")
+        end
       end
-
     end
 
   end

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

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:package).provider(:pip)
-osfamilies = { ['RedHat', '6'] => 'pip-python', ['RedHat', '7'] => 'pip', ['Not RedHat', nil] => 'pip' }
+osfamilies = { ['All', nil] => ['pip', 'pip-python'] }
 
 describe provider_class do
 
@@ -12,7 +12,6 @@ describe provider_class do
     @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
@@ -32,42 +31,44 @@ describe provider_class do
   end
 
   describe "cmd" do
-    it "should return pip-python on RedHat < 7 systems" do
-      Facter.stubs(:value).with(:osfamily).returns("RedHat")
-      Facter.stubs(:value).with(:operatingsystemmajrelease).returns("6")
-      expect(provider_class.cmd).to eq('pip-python')
-    end
-
-    it "should return pip on RedHat >= 7 systems" do
-      Facter.stubs(:value).with(:osfamily).returns("RedHat")
-      Facter.stubs(:value).with(:operatingsystemmajrelease).returns("7")
-      expect(provider_class.cmd).to eq('pip')
+    it "should return pip-python on legacy systems" do
+      Facter.stubs(:value).with(:osfamily).returns("legacy")
+      expect(provider_class.cmd[1]).to eq('pip-python')
     end
 
     it "should return pip by default" do
-      Facter.stubs(:value).with(:osfamily).returns("Not RedHat")
-      expect(provider_class.cmd).to eq('pip')
+      Facter.stubs(:value).with(:osfamily).returns("All")
+      expect(provider_class.cmd[0]).to eq('pip')
     end
 
   end
 
   describe "instances" do
 
-    osfamilies.each do |osfamily, pip_cmd|
-      it "should return an array on #{osfamily} when #{pip_cmd} is present" do
+    osfamilies.each do |osfamily, pip_cmds|
+      it "should return an array on #{osfamily} when #{pip_cmds.join(' or ')} is present" do
         Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
         Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
-        provider_class.expects(:which).with(pip_cmd).returns("/fake/bin/pip")
-        p = stub("process")
-        p.expects(:collect).yields("real_package==1.2.5")
-        provider_class.expects(:execpipe).with("/fake/bin/pip freeze").yields(p)
-        provider_class.instances
+        pip_cmds.each do |pip_cmd|
+          pip_cmds.each do |cmd|
+            unless cmd == pip_cmd
+              provider_class.expects(:which).with(cmd).returns(nil)
+            end
+          end
+          provider_class.expects(:which).with(pip_cmd).returns("/fake/bin/#{pip_cmd}")
+          p = stub("process")
+          p.expects(:collect).yields("real_package==1.2.5")
+          provider_class.expects(:execpipe).with("/fake/bin/#{pip_cmd} freeze").yields(p)
+          provider_class.instances
+        end
       end
 
-      it "should return an empty array on #{osfamily} when #{pip_cmd} is missing" do
+      it "should return an empty array on #{osfamily} when #{pip_cmds.join(' and ')} are missing" do
         Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
         Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
-        provider_class.expects(:which).with(pip_cmd).returns nil
+        pip_cmds.each do |cmd|
+          provider_class.expects(:which).with(cmd).returns nil
+        end
         expect(provider_class.instances).to eq([])
       end
     end
@@ -118,23 +119,52 @@ describe provider_class do
   end
 
   describe "latest" do
+    context "connecting directly" do
 
-    it "should find a version number for real_package" do
-      @resource[:name] = "real_package"
-      expect(@provider.latest).not_to eq(nil)
-    end
+      before :each do
+        XMLRPC::Client.expects(:new2).with("http://pypi.python.org/pypi", nil).returns(@client)
+      end
 
-    it "should not find a version number for fake_package" do
-      @resource[:name] = "fake_package"
-      expect(@provider.latest).to eq(nil)
-    end
+      it "should find a version number for real_package" do
+        @resource[:name] = "real_package"
+        expect(@provider.latest).not_to eq(nil)
+      end
 
-    it "should handle a timeout gracefully" do
-      @resource[:name] = "fake_package"
-      @client.stubs(:call).raises(Timeout::Error)
-      expect { @provider.latest }.to raise_error(Puppet::Error)
+      it "should not find a version number for fake_package" do
+        @resource[:name] = "fake_package"
+        expect(@provider.latest).to eq(nil)
+      end
+
+      it "should handle a timeout gracefully" do
+        @resource[:name] = "fake_package"
+        @client.stubs(:call).raises(Timeout::Error)
+        expect { @provider.latest }.to raise_error(Puppet::Error)
+      end
     end
 
+    context "connecting via a proxy" do
+      before :each do
+        Puppet::Util::HttpProxy.expects(:http_proxy_host).returns 'some_host'
+        Puppet::Util::HttpProxy.expects(:http_proxy_port).returns 'some_port'
+        XMLRPC::Client.expects(:new2).with("http://pypi.python.org/pypi", "some_host:some_port").returns(@client)
+      end
+
+      it "should find a version number for real_package" do
+        @resource[:name] = "real_package"
+        expect(@provider.latest).not_to eq(nil)
+      end
+
+      it "should not find a version number for fake_package" do
+        @resource[:name] = "fake_package"
+        expect(@provider.latest).to eq(nil)
+      end
+
+      it "should handle a timeout gracefully" do
+        @resource[:name] = "fake_package"
+        @client.stubs(:call).raises(Timeout::Error)
+        expect { @provider.latest }.to raise_error(Puppet::Error)
+      end
+    end
   end
 
   describe "install" do
@@ -235,30 +265,41 @@ describe provider_class do
       @provider.method(:lazy_pip).call "freeze"
     end
 
-    osfamilies.each do |osfamily, pip_cmd|
-      it "should retry on #{osfamily} if #{pip_cmd} has not yet been found" do
-        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
-        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
-        @provider.expects(:pip).twice.with('freeze').raises(NoMethodError).then.returns(nil)
-        @provider.expects(:which).with(pip_cmd).returns("/fake/bin/pip")
-        @provider.method(:lazy_pip).call "freeze"
+    osfamilies.each do |osfamily, pip_cmds|
+      pip_cmds.each do |pip_cmd|
+        it "should retry on #{osfamily} if #{pip_cmd} has not yet been found" do
+          Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
+          Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+          @provider.expects(:pip).twice.with('freeze').raises(NoMethodError).then.returns(nil)
+          pip_cmds.each do |cmd|
+            unless cmd == pip_cmd
+              @provider.expects(:which).with(cmd).returns(nil)
+            end
+          end
+          @provider.expects(:which).with(pip_cmd).returns("/fake/bin/#{pip_cmd}")
+          @provider.method(:lazy_pip).call "freeze"
+        end
       end
 
-      it "should fail on #{osfamily} if #{pip_cmd} is missing" do
+      it "should fail on #{osfamily} if #{pip_cmds.join(' and ')} are missing" do
         Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
         Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
         @provider.expects(:pip).with('freeze').raises(NoMethodError)
-        @provider.expects(:which).with(pip_cmd).returns(nil)
+        pip_cmds.each do |pip_cmd|
+          @provider.expects(:which).with(pip_cmd).returns(nil)
+        end
         expect { @provider.method(:lazy_pip).call("freeze") }.to raise_error(NoMethodError)
       end
 
-      it "should output a useful error message on #{osfamily} if #{pip_cmd} is missing" do
+      it "should output a useful error message on #{osfamily} if #{pip_cmds.join(' and ')} are missing" do
         Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
         Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
         @provider.expects(:pip).with('freeze').raises(NoMethodError)
-        @provider.expects(:which).with(pip_cmd).returns(nil)
+        pip_cmds.each do |pip_cmd|
+          @provider.expects(:which).with(pip_cmd).returns(nil)
+        end
         expect { @provider.method(:lazy_pip).call("freeze") }.
-          to raise_error(NoMethodError, "Could not locate the #{pip_cmd} command.")
+          to raise_error(NoMethodError, "Could not locate command #{pip_cmds.join(' and ')}.")
       end
 
     end

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

@@ -1,6 +1,9 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 
+module Puppet::Util::Plist
+end
+
 describe Puppet::Type.type(:package).provider(:pkgdmg) do
   let(:resource) { Puppet::Type.type(:package).new(:name => 'foo', :provider => :pkgdmg) }
   let(:provider) { described_class.new(resource) }
@@ -26,8 +29,7 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
   # These tests shouldn't be this messy. The pkgdmg provider needs work...
   describe "when installing a pkgdmg" do
     let(:fake_mountpoint) { "/tmp/dmg.foo" }
-    let(:empty_hdiutil_plist) { Plist::Emit.dump({}) }
-    let(:fake_hdiutil_plist) { Plist::Emit.dump({"system-entities" => [{"mount-point" => fake_mountpoint}]}) }
+    let(:fake_hdiutil_plist) { {"system-entities" => [{"mount-point" => fake_mountpoint}]} }
 
     before do
       fh = mock 'filehandle'
@@ -39,20 +41,23 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
     end
 
     it "should fail when a disk image with no system entities is mounted" do
-      described_class.stubs(:hdiutil).returns(empty_hdiutil_plist)
+      described_class.stubs(:hdiutil).returns 'empty plist'
+      Puppet::Util::Plist.expects(:parse_plist).with('empty plist').returns({})
       expect { provider.install }.to raise_error(Puppet::Error, /No disk entities/)
     end
 
     it "should call hdiutil to mount and eject the disk image" do
       Dir.stubs(:entries).returns []
       provider.class.expects(:hdiutil).with("eject", fake_mountpoint).returns 0
-      provider.class.expects(:hdiutil).with("mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", nil).returns fake_hdiutil_plist
+      provider.class.expects(:hdiutil).with("mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", nil).returns 'a plist'
+      Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
       provider.install
     end
 
     it "should call installpkg if a pkg/mpkg is found on the dmg" do
       Dir.stubs(:entries).returns ["foo.pkg"]
-      provider.class.stubs(:hdiutil).returns fake_hdiutil_plist
+      provider.class.stubs(:hdiutil).returns 'a plist'
+      Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
       provider.class.expects(:installpkg).with("#{fake_mountpoint}/foo.pkg", resource[:name], "foo.dmg").returns ""
       provider.install
     end
@@ -70,7 +75,8 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
         described_class.expects(:curl).with do |*args|
           args[0] == "-o" && args[1].include?(tmpdir) && args.include?("--fail") && ! args.include?("-k")
         end
-        described_class.stubs(:hdiutil).returns fake_hdiutil_plist
+        described_class.stubs(:hdiutil).returns 'a plist'
+        Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
         described_class.expects(:installpkg)
 
         provider.install
@@ -86,7 +92,8 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
           expect(args).to be_include 'some_host:some_port'
           expect(args).to be_include '--proxy'
         end
-        described_class.stubs(:hdiutil).returns fake_hdiutil_plist
+        described_class.stubs(:hdiutil).returns 'a plist'
+        Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
         described_class.expects(:installpkg)
 
         provider.install
@@ -102,7 +109,8 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
           expect(args).to be_include 'some_host'
           expect(args).to be_include '--proxy'
         end
-        described_class.stubs(:hdiutil).returns fake_hdiutil_plist
+        described_class.stubs(:hdiutil).returns 'a plist'
+        Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
         described_class.expects(:installpkg)
 
         provider.install
@@ -119,7 +127,8 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
           expect(args).not_to be_include '--proxy'
           true
         end
-        described_class.stubs(:hdiutil).returns fake_hdiutil_plist
+        described_class.stubs(:hdiutil).returns 'a plist'
+        Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
         described_class.expects(:installpkg)
 
         provider.install

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

@@ -151,12 +151,14 @@ describe provider_class do
 
   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')
+      version_list = File.read(my_fixture('pkg.version'))
+      nmap_latest_version = provider_class.get_latest_version('security/nmap', version_list)
       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')
+      version_list = File.read(my_fixture('pkg.version'))
+      bash_comp_latest_version = provider_class.get_latest_version('shells/bash-completion', version_list)
       expect(bash_comp_latest_version).to eq('2.1_3')
     end
   end

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

@@ -12,7 +12,6 @@ describe provider_class do
     chkconfig 0 1.3.30.2 2.el5 x86_64
     myresource 0 1.2.3.4 5.el4 noarch
     mysummaryless 0 1.2.3.4 5.el4 noarch
-    tomcat 1 1.2.3.4 5.fc22 noarch
     RPM_OUTPUT
   end
 
@@ -117,18 +116,7 @@ describe provider_class do
           :ensure => "1.3.30.2-2.el5",
         }
       )
-      expect(installed_packages[3].properties).to eq(
-        {
-          :provider    => :rpm,
-          :name        => "myresource",
-          :epoch       => "0",
-          :version     => "1.2.3.4",
-          :release     => "5.el4",
-          :arch        => "noarch",
-          :ensure      => "1.2.3.4-5.el4",
-        }
-      )
-      expect(installed_packages[4].properties).to eq(
+      expect(installed_packages.last.properties).to eq(
         {
           :provider    => :rpm,
           :name        => "mysummaryless",
@@ -139,17 +127,6 @@ describe provider_class do
           :ensure      => "1.2.3.4-5.el4",
         }
       )
-      expect(installed_packages[5].properties).to eq(
-        {
-          :provider    => :rpm,
-          :name        => "tomcat",
-          :epoch       => "1",
-          :version     => "1.2.3.4",
-          :release     => "5.fc22",
-          :arch        => "noarch",
-          :ensure      => "1:1.2.3.4-5.fc22",
-        }
-      )
     end
   end
 
@@ -292,7 +269,7 @@ describe provider_class do
           line.gsub(field, delimiter),
           package_hash.merge(
             field.to_sym => delimiter,
-            :ensure => 'epoch:version-release'.gsub(field, delimiter)
+            :ensure => 'version-release'.gsub(field, delimiter)
           )
         )
       end

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

@@ -448,7 +448,7 @@ describe provider_class do
 
     it "returns an empty hash if 'yum check-update' returned an exit code that was not 0 or 100" do
       Puppet::Util::Execution.expects(:execute).returns(stub(:exitstatus => 1))
-      described_class.expects(:warn)
+      described_class.expects(:warning).with('Could not check for updates, \'/usr/bin/yum check-update\' exited with 1')
       expect(described_class.check_updates([], [], [])).to eq({})
     end
   end
@@ -505,6 +505,17 @@ describe provider_class do
         expect(output).to include("yum-plugin-fastestmirror.noarch")
       end
     end
+    describe "with broken update notices" do
+      let(:check_update) { File.read(my_fixture('yum-check-update-broken-notices.txt')) }
+      let(:output) { described_class.parse_updates(check_update) }
+
+      it "ignores all entries including and after 'Update'" do
+        expect(output).not_to include("Update")
+      end
+      it "includes updates before 'Update'" do
+        expect(output).to include("yum-plugin-fastestmirror.noarch")
+      end
+    end
   end
 
   describe "parsing a line from yum check-update" do

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

@@ -214,4 +214,18 @@ describe provider_class do
       @provider.install
     end
   end
+
+  describe 'when uninstalling' do
+    it 'should use remove to uninstall on zypper version 1.6 and above' do
+      @provider.stubs(:zypper_version).returns '1.6.308'
+      @provider.expects(:zypper).with(:remove, '--no-confirm', 'mypackage')
+      @provider.uninstall
+    end
+
+    it 'should use remove  --force-solution to uninstall on zypper versions between 1.0 and 1.6' do
+      @provider.stubs(:zypper_version).returns '1.0.2'
+      @provider.expects(:zypper).with(:remove, '--no-confirm', '--force-resolution', 'mypackage')
+      @provider.uninstall
+    end
+  end
 end

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

@@ -27,6 +27,7 @@ describe provider_class do
 
     @provider.stubs(:command).with(:update_rc).returns "update_rc"
     @provider.stubs(:command).with(:invoke_rc).returns "invoke_rc"
+    @provider.stubs(:command).with(:service).returns "service"
 
     @provider.stubs(:update_rc)
     @provider.stubs(:invoke_rc)
@@ -142,30 +143,11 @@ describe provider_class do
   end
 
   describe "when checking service status" do
-    context "On systems which use the systemd-sysvinit compatibility layer" do
-      it "should call systemctl to determine running status in Debian" do
-        Facter.stubs(:value).with(:operatingsystem).returns('Debian')
-        Facter.stubs(:value).with(:operatingsystemmajrelease).returns('8')
-        @resource.stubs(:[]).with(:hasstatus).returns(:true)
-        expect(@provider.statuscmd).to eq(["systemctl", "is-active", @resource[:name]])
-      end
-
-      it "should call systemctl to determine running status in Ubuntu" do
-        Facter.stubs(:value).with(:operatingsystem).returns('Ubuntu')
-        Facter.stubs(:value).with(:operatingsystemmajrelease).returns('15.04')
-        @resource.stubs(:[]).with(:hasstatus).returns(:true)
-        expect(@provider.statuscmd).to eq(["systemctl", "is-active", @resource[:name]])
-      end
-    end
-
-    context "On systems which only use sysvinit" do
-      it "should use the service init script" do
-        Facter.stubs(:value).with(:operatingsystem).returns('Debian')
-        Facter.stubs(:value).with(:operatingsystemmajrelease).returns('7')
-        @resource.stubs(:[]).with(:hasstatus).returns(:true)
-        @provider.stubs(:initscript).returns("/etc/init.d/script")
-        expect(@provider.statuscmd).to eq(["/etc/init.d/script", :status])
-      end
+    it "should use the service command" do
+      Facter.stubs(:value).with(:operatingsystem).returns('Debian')
+      Facter.stubs(:value).with(:operatingsystemmajrelease).returns('8')
+      @resource.stubs(:[]).with(:hasstatus).returns(:true)
+      expect(@provider.statuscmd).to eq(["service", @resource[:name], "status"])
     end
   end
 end

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

@@ -39,7 +39,7 @@ describe Puppet::Type.type(:service).provider(:init) do
     before :each do
       described_class.stubs(:defpath).returns('tmp')
 
-      @services = ['one', 'two', 'three', 'four']
+      @services = ['one', 'two', 'three', 'four', 'umountfs']
       Dir.stubs(:entries).with('tmp').returns @services
       FileTest.expects(:directory?).with('tmp').returns(true)
       FileTest.stubs(:executable?).returns(true)
@@ -59,6 +59,16 @@ describe Puppet::Type.type(:service).provider(:init) do
       expect(described_class.get_services(described_class.defpath, exclude).map(&:name)).to eq(@services - [exclude])
     end
 
+    it "should omit Yocto services on cisco-wrlinux" do
+      Facter.stubs(:value).with(:osfamily).returns 'cisco-wrlinux'
+      exclude = 'umountfs'
+      expect(described_class.get_services(described_class.defpath).map(&:name)).to eq(@services - [exclude])
+    end
+
+    it "should not omit Yocto services on non cisco-wrlinux platforms" do
+      expect(described_class.get_services(described_class.defpath).map(&:name)).to eq(@services)
+    end
+
     it "should use defpath" do
       expect(described_class.instances).to be_all { |provider| provider.get(:path) == described_class.defpath }
     end