puppet 6.8.1 → 6.9.0

data/spec/unit/face/help_spec.rb

@@ -155,7 +155,7 @@ describe Puppet::Face[:help, '0.0.1'] do
     # If we don't, these tests are ... less than useful, because they assume
     # it.  When this breaks you should consider ditching the entire feature
     # and tests, but if not work out how to fake one. --daniel 2011-04-11
-    it { is_expected.to have_at_least(1).item }
+    it { expect(subject.count).to be > 1 }
 
     # Meh.  This is nasty, but we can't control the other list; the specific
     # bug that caused these to be listed is annoyingly subtle and has a nasty

data/spec/unit/face/plugin_spec.rb

@@ -50,6 +50,14 @@ describe Puppet::Face[:plugin, :current] do
       expect(receive_count).to eq(3)
       expect(render(result)).to eq('Downloaded these plugins: /a, /b, /c')
     end
+
+    it "uses persistent HTTP pool" do
+      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
+        expect(Puppet.lookup(:http_pool)).to be_instance_of(Puppet::Network::HTTP::Pool)
+      end.and_return([])
+
+      pluginface.download
+    end
   end
 
   context "download when server_agent_version is 5.3.3" do

data/spec/unit/forge/forge_spec.rb

@@ -97,10 +97,8 @@ describe Puppet::Forge do
   def mock_proxy(port, proxy_args, result, &block)
     http = double("http client")
     proxy = double("http proxy")
-    proxy_class = double("http proxy class")
 
-    expect(Net::HTTP).to receive(:Proxy).with(*proxy_args).and_return(proxy_class)
-    expect(proxy_class).to receive(:new).with(host, port).and_return(proxy)
+    expect(Net::HTTP).to receive(:new).with(host, port, *proxy_args).and_return(proxy)
 
     expect(proxy).to receive(:open_timeout=)
     expect(proxy).to receive(:read_timeout=)

data/spec/unit/forge/repository_spec.rb

@@ -234,10 +234,8 @@ describe Puppet::Forge::Repository do
   def mock_proxy(port, proxy_args, result, &block)
     http = double("http client")
     proxy = double("http proxy")
-    proxy_class = double("http proxy class")
 
-    expect(Net::HTTP).to receive(:Proxy).with(*proxy_args).and_return(proxy_class)
-    expect(proxy_class).to receive(:new).with("fake.com", port).and_return(proxy)
+    expect(Net::HTTP).to receive(:new).with("fake.com", port, *proxy_args).and_return(proxy)
 
     expect(proxy).to receive(:open_timeout=)
     expect(proxy).to receive(:read_timeout=)

data/spec/unit/functions/contain_spec.rb

@@ -192,7 +192,7 @@ describe 'The "contain" function' do
     contained = catalog.resource("Class", "contained")
     container = catalog.resource("Class", "container")
 
-    expect(catalog.edges_between(container, contained)).to have(1).item
+    expect(catalog.edges_between(container, contained).count).to eq 1
   end
 
   context "when a containing class has a dependency order" do

data/spec/unit/indirector/catalog/compiler_spec.rb

@@ -4,6 +4,12 @@ require 'matchers/resource'
 
 require 'puppet/indirector/catalog/compiler'
 
+def set_facts(fact_hash)
+  fact_hash.each do |key, value|
+    allow(Facter).to receive(:value).with(key).and_return(value)
+  end
+end
+
 describe Puppet::Resource::Catalog::Compiler do
   let(:compiler) { described_class.new }
   let(:node_name) { "foo" }
@@ -16,8 +22,11 @@ describe Puppet::Resource::Catalog::Compiler do
   describe "when initializing" do
     before do
       expect(Puppet).to receive(:version).and_return(1)
-      expect(Facter).to receive(:value).with('fqdn').and_return("my.server.com")
-      expect(Facter).to receive(:value).with('ipaddress').and_return("my.ip.address")
+      set_facts({
+        'fqdn'       => "my.server.com",
+        'ipaddress'  => "my.ip.address",
+        'ipaddress6' => nil
+        })
     end
 
     it "should gather data about itself" do
@@ -390,9 +399,12 @@ describe Puppet::Resource::Catalog::Compiler do
 
   describe "after finding nodes" do
     before do
-      expect(Puppet).to receive(:version).and_return(1)
-      expect(Facter).to receive(:value).with('fqdn').and_return("my.server.com")
-      expect(Facter).to receive(:value).with('ipaddress').and_return("my.ip.address")
+      allow(Puppet).to receive(:version).and_return(1)
+      set_facts({
+        'fqdn'       => "my.server.com",
+        'ipaddress'  => "my.ip.address",
+        'ipaddress6' => nil
+        })
       @request = Puppet::Indirector::Request.new(:catalog, :find, node_name, nil)
       allow(compiler).to receive(:compile)
       allow(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
@@ -412,6 +424,51 @@ describe Puppet::Resource::Catalog::Compiler do
       expect(node).to receive(:merge).with(hash_including("serverip" => "my.ip.address"))
       compiler.find(@request)
     end
+
+    it "shouldn't warn if there is at least one ip fact" do
+      expect(node).to receive(:merge).with(hash_including("serverip" => "my.ip.address"))
+      compiler.find(@request)
+      expect(@logs).not_to be_any {|log| log.level == :warning and log.message =~ /Could not retrieve either serverip or serverip6 fact/}
+    end
+  end
+
+  describe "in an IPv6 only environment" do
+    before do |example|
+      allow(Puppet).to receive(:version).and_return(1)
+      set_facts({
+        'fqdn'       => "my.server.com",
+        'ipaddress'  => nil,
+      })
+      if example.metadata[:nil_ipv6]
+        set_facts({
+          'ipaddress6' => nil
+        })
+      else
+        set_facts({
+          'ipaddress6' => "my.ipv6.address"
+        })
+      end
+      @request = Puppet::Indirector::Request.new(:catalog, :find, node_name, nil)
+      allow(compiler).to receive(:compile)
+      allow(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
+    end
+
+    it "should populate the :serverip6 fact" do
+      expect(node).to receive(:merge).with(hash_including("serverip6" => "my.ipv6.address"))
+      compiler.find(@request)
+    end
+
+    it "shouldn't warn if there is at least one ip fact" do
+      expect(node).to receive(:merge).with(hash_including("serverip6" => "my.ipv6.address"))
+      compiler.find(@request)
+      expect(@logs).not_to be_any {|log| log.level == :warning and log.message =~ /Could not retrieve either serverip or serverip6 fact/}
+    end
+
+    it "should warn if there are no ip facts", :nil_ipv6 do
+      expect(node).to receive(:merge)
+      compiler.find(@request)
+      expect(@logs).to be_any {|log| log.level == :warning and log.message =~ /Could not retrieve either serverip or serverip6 fact/}
+    end
   end
 
   describe "when filtering resources" do

data/spec/unit/module_tool/applications/uninstaller_spec.rb

@@ -58,6 +58,12 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
       subject[:affected_modules].length == 1
     end
 
+    it 'should refuse to uninstall in FIPS mode' do
+      allow(Facter).to receive(:value).with(:fips_enabled).and_return(true)
+      err = subject[:error][:oneline]
+      expect(err).to eq("Either the `--ignore_changes` or `--force` argument must be specified to uninstall modules when running in FIPS mode.")
+    end
+
     context 'in two modulepaths' do
       before { preinstall('pmtacceptance-stdlib', '2.0.0', :into => secondary_dir) }
 
@@ -126,6 +132,11 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
         it 'overwrites the installed module with the greatest version matching that range' do
           expect(subject).to include :result => :success
         end
+
+        it 'uninstalls in FIPS mode' do
+          allow(Facter).to receive(:value).with(:fips_enabled).and_return(true)
+          expect(subject).to include :result => :success
+        end
       end
 
       context 'without local changes' do
@@ -150,6 +161,11 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
           expect(subject[:affected_modules].length).to eq(1)
           expect(subject[:affected_modules].first.forge_name).to eq("pmtacceptance/stdlib")
         end
+
+        it 'uninstalls in FIPS mode' do
+          allow(Facter).to receive(:value).with(:fips_enabled).and_return(true)
+          expect(subject).to include :result => :success
+        end
       end
 
       context "while depended upon" do
@@ -162,11 +178,4 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
       end
     end
   end
-
-  context 'when in FIPS mode...' do
-    it 'module uninstaller refuses to run' do
-      allow(Facter).to receive(:value).with(:fips_enabled).and_return(true)
-      expect {application.run}.to raise_error(/Module uninstall is prohibited in FIPS mode/)
-    end 
-  end
 end

data/spec/unit/node/environment_spec.rb

@@ -53,7 +53,7 @@ describe Puppet::Node::Environment do
 
         expect(hash[base]).to eq("same env")
         expect(hash[different]).to eq("different env")
-        expect(hash).to have(2).item
+        expect(hash.count).to eq 2
       end
 
       it "is equal when name, modules, and manifests are the same" do

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

@@ -16,7 +16,7 @@ describe Puppet::Type.type(:package).provider(:aptrpm) do
     end
 
     def rpm_args
-      ['-q', 'faff', '--nosignature', '--nodigest', '--qf', "'%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}\\n'"]
+      ['-q', 'faff', '--nosignature', '--nodigest', '--qf', "%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}\\n"]
     end
 
     it "should report purged packages" do

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

@@ -44,5 +44,12 @@ describe Puppet::Type.type(:package).provider(:dnf) do
     end
   end
 
+  describe 'provider features' do
+    it { is_expected.to be_versionable }
+    it { is_expected.to be_install_options }
+    it { is_expected.to be_virtual_packages }
+    it { is_expected.to be_install_only }
+  end
+
   it_behaves_like 'RHEL package provider', described_class, 'dnf'
 end

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

@@ -48,7 +48,7 @@ describe Puppet::Type.type(:package).provider(:pkgin) do
 
     it "returns an array of providers for each package" do
       instances = described_class.instances
-      expect(instances).to have(2).items
+      expect(instances.count).to eq 2
       instances.each do |instance|
         expect(instance).to be_a(described_class)
       end

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

@@ -9,6 +9,8 @@ describe Puppet::Type.type(:package).provider(:rpm) do
     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.el4 x86_64
+    kernel 1 1.2.3.4 5.el4 x86_64
+    kernel 1 1.2.3.6 5.el4 x86_64
     '
     RPM_OUTPUT
   end
@@ -57,7 +59,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
     describe "with a modern version of RPM" do
       it "includes all the modern flags" do
         expect(Puppet::Util::Execution).to receive(:execpipe)
-          .with("/bin/rpm -qa --nosignature --nodigest --qf '#{nevra_format}'")
+          .with("/bin/rpm -qa --nosignature --nodigest --qf '#{nevra_format}' | sort")
           .and_yield(packages)
 
         described_class.instances
@@ -69,7 +71,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
 
       it "excludes the --nosignature flag" do
         expect(Puppet::Util::Execution).to receive(:execpipe)
-          .with("/bin/rpm -qa  --nodigest --qf '#{nevra_format}'")
+          .with("/bin/rpm -qa  --nodigest --qf '#{nevra_format}' | sort")
           .and_yield(packages)
 
         described_class.instances
@@ -81,7 +83,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
 
       it "excludes the --nodigest flag" do
         expect(Puppet::Util::Execution).to receive(:execpipe)
-        .with("/bin/rpm -qa   --qf '#{nevra_format}'")
+        .with("/bin/rpm -qa   --qf '#{nevra_format}' | sort")
         .and_yield(packages)
 
         described_class.instances
@@ -90,7 +92,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
 
     it "returns an array of packages" do
       expect(Puppet::Util::Execution).to receive(:execpipe)
-        .with("/bin/rpm -qa --nosignature --nodigest --qf '#{nevra_format}'")
+        .with("/bin/rpm -qa --nosignature --nodigest --qf '#{nevra_format}' | sort")
         .and_yield(packages)
 
       installed_packages = described_class.instances
@@ -161,6 +163,17 @@ describe Puppet::Type.type(:package).provider(:rpm) do
           :ensure      => "1:1.2.3.4-5.el4",
         }
       )
+      expect(installed_packages[6].properties).to eq(
+        {
+          :provider    => :rpm,
+          :name        => "kernel",
+          :epoch       => "1",
+          :version     => "1.2.3.4",
+          :release     => "5.el4",
+          :arch        => "x86_64",
+          :ensure      => "1:1.2.3.4-5.el4; 1:1.2.3.6-5.el4",
+        }
+      )
     end
   end
 
@@ -218,7 +231,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
     it "retrieves version string after querying rpm for version from source file" do
       expect(resource).to receive(:[]).with(:source).and_return('source-string')
       expect(Puppet::Util::Execution).to receive(:execute)
-        .with(["/bin/rpm", "-q", "--qf", "'#{nevra_format}'", "-p", "source-string"])
+        .with(["/bin/rpm", "-q", "--qf", "#{nevra_format}", "-p", "source-string"])
         .and_return(Puppet::Util::Execution::ProcessOutput.new("myresource 0 1.2.3.4 5.el4 noarch\n", 0))
       expect(provider.latest).to eq("1.2.3.4-5.el4")
     end
@@ -226,7 +239,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
     it "raises an error if the rpm command fails" do
       expect(resource).to receive(:[]).with(:source).and_return('source-string')
       expect(Puppet::Util::Execution).to receive(:execute)
-        .with(["/bin/rpm", "-q", "--qf", "'#{nevra_format}'", "-p", "source-string"])
+        .with(["/bin/rpm", "-q", "--qf", "#{nevra_format}", "-p", "source-string"])
         .and_raise(Puppet::ExecutionFailure, 'rpm command failed')
 
       expect {
@@ -248,7 +261,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
 
       before(:each) do
         expect(Puppet::Util::Execution).to receive(:execute)
-          .with(["/bin/rpm", "-q", resource_name, '', '', '--qf', "'#{nevra_format}'"], execute_options)
+          .with(["/bin/rpm", "-q", resource_name, '', '', '--qf', "#{nevra_format}"], execute_options)
           .and_return(Puppet::Util::Execution::ProcessOutput.new("#{resource_name} 0 1.2.3.4 5.el4 noarch\n", 0))
       end
 
@@ -266,7 +279,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
 
       before(:each) do
         expect(Puppet::Util::Execution).to receive(:execute)
-          .with(["/bin/rpm", "-q", resource_name, '--nosignature', '--nodigest', "--qf", "'#{nevra_format}'"], execute_options)
+          .with(["/bin/rpm", "-q", resource_name, '--nosignature', '--nodigest', "--qf", "#{nevra_format}"], execute_options)
           .and_return(Puppet::Util::Execution::ProcessOutput.new("#{resource_name} 0 1.2.3.4 5.el4 noarch\n", 0))
       end
 
@@ -290,7 +303,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
 
       before(:each) do
         expect(Puppet::Util::Execution).to receive(:execute)
-          .with(["/bin/rpm", "-q", "#{resource_name}.noarch", '--nosignature', '--nodigest', "--qf", "'#{nevra_format}'"], execute_options)
+          .with(["/bin/rpm", "-q", "#{resource_name}.noarch", '--nosignature', '--nodigest', "--qf", "#{nevra_format}"], execute_options)
           .and_return(Puppet::Util::Execution::ProcessOutput.new("#{resource_name} 0 1.2.3.4 5.el4 noarch\n", 0))
       end
 
@@ -312,7 +325,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
 
       before(:each) do
         expect(Puppet::Util::Execution).to receive(:execute)
-          .with(["/bin/rpm", "-q", "#{resource_name}-1.2.3.4-5.el4", '--nosignature', '--nodigest', "--qf", "'#{nevra_format}'"], execute_options)
+          .with(["/bin/rpm", "-q", "#{resource_name}-1.2.3.4-5.el4", '--nosignature', '--nodigest', "--qf", "#{nevra_format}"], execute_options)
           .and_return(Puppet::Util::Execution::ProcessOutput.new("#{resource_name} 0 1.2.3.4 5.el4 noarch\n", 0))
       end
 
@@ -334,7 +347,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
 
       before(:each) do
         expect(Puppet::Util::Execution).to receive(:execute)
-          .with(["/bin/rpm", "-q", "#{resource_name}-1.2.3.4", '--nosignature', '--nodigest', "--qf", "'#{nevra_format}'"], execute_options)
+          .with(["/bin/rpm", "-q", "#{resource_name}-1.2.3.4", '--nosignature', '--nodigest', "--qf", "#{nevra_format}"], execute_options)
           .and_return(Puppet::Util::Execution::ProcessOutput.new("#{resource_name} 0 1.2.3.4 5.el4 noarch\n", 0))
       end
 
@@ -358,7 +371,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
 
       before(:each) do
         expect(Puppet::Util::Execution).to receive(:execute)
-          .with(["/bin/rpm", "-q", resource_name, '--nosignature', '--nodigest', "--qf", "'#{nevra_format}'"], execute_options)
+          .with(["/bin/rpm", "-q", resource_name, '--nosignature', '--nodigest', "--qf", "#{nevra_format}"], execute_options)
           .and_return(Puppet::Util::Execution::ProcessOutput.new("#{resource_name} 0 1.2.3.4 5.el4 noarch\n", 0))
       end
 
@@ -374,7 +387,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
     def parser_test(rpm_output_string, gold_hash, number_of_debug_logs = 0)
       expect(Puppet).to receive(:debug).exactly(number_of_debug_logs).times()
       expect(Puppet::Util::Execution).to receive(:execute)
-        .with(["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", "'#{nevra_format}'"], execute_options)
+        .with(["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", "#{nevra_format}"], execute_options)
         .and_return(Puppet::Util::Execution::ProcessOutput.new(rpm_output_string, 0))
       expect(provider.query).to eq(gold_hash)
     end
@@ -413,7 +426,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
     describe "when the package is not found" do
       before do
         expect(Puppet).not_to receive(:debug)
-        expected_args = ["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", "'#{nevra_format}'"]
+        expected_args = ["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", "#{nevra_format}"]
         expect(Puppet::Util::Execution).to receive(:execute)
           .with(expected_args, execute_options)
           .and_raise(Puppet::ExecutionFailure.new("package #{resource_name} is not installed"))
@@ -426,7 +439,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
 
       it "does not log or fail if allow_virtual is true" do
         resource[:allow_virtual] = true
-        expected_args = ['/bin/rpm', '-q', resource_name, '--nosignature', '--nodigest', '--qf', "'#{nevra_format}'", '--whatprovides']
+        expected_args = ['/bin/rpm', '-q', resource_name, '--nosignature', '--nodigest', '--qf', "#{nevra_format}", '--whatprovides']
         expect(Puppet::Util::Execution).to receive(:execute)
           .with(expected_args, execute_options)
           .and_raise(Puppet::ExecutionFailure.new("package #{resource_name} is not provided"))
@@ -436,7 +449,7 @@ describe Puppet::Type.type(:package).provider(:rpm) do
 
     it "parses virtual package" do
       provider.resource[:allow_virtual] = true
-      expected_args = ["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", "'#{nevra_format}'"]
+      expected_args = ["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", "#{nevra_format}"]
       expect(Puppet::Util::Execution).to receive(:execute)
         .with(expected_args, execute_options)
         .and_raise(Puppet::ExecutionFailure.new("package #{resource_name} is not installed"))
@@ -749,4 +762,125 @@ describe Puppet::Type.type(:package).provider(:rpm) do
       provider.compare_values('s1', 's2')
     end
   end
+
+
+  describe 'insync?' do
+    context 'for multiple versions' do
+      let(:is) { '1:1.2.3.4-5.el4; 1:5.6.7.8-5.el4' }
+      it 'returns true if there is match and feature is enabled' do
+        resource[:install_only] = true
+        resource[:ensure] = '1:1.2.3.4-5.el4'
+        expect(provider).to be_insync(is)
+      end
+      it 'returns false if there is match and feature is not enabled' do
+        resource[:ensure] = '1:1.2.3.4-5.el4'
+        expect(provider).to_not be_insync(is)
+      end
+      it 'returns false if no match and feature is enabled' do
+        resource[:install_only] = true
+        resource[:ensure] = '1:1.2.3.6-5.el4'
+        expect(provider).to_not be_insync(is)
+      end
+      it 'returns false if no match and feature is not enabled' do
+        resource[:ensure] = '1:1.2.3.6-5.el4'
+        expect(provider).to_not be_insync(is)
+      end
+    end
+    context 'for simple versions' do
+      let(:is) { '1:1.2.3.4-5.el4' }
+      it 'returns true if there is match and feature is enabled' do
+        resource[:install_only] = true
+        resource[:ensure] = '1:1.2.3.4-5.el4'
+        expect(provider).to be_insync(is)
+      end
+      it 'returns true if there is match and feature is not enabled' do
+        resource[:ensure] = '1:1.2.3.4-5.el4'
+        expect(provider).to be_insync(is)
+      end
+      it 'returns false if no match and feature is enabled' do
+        resource[:install_only] = true
+        resource[:ensure] = '1:1.2.3.6-5.el4'
+        expect(provider).to_not be_insync(is)
+      end
+      it 'returns false if no match and feature is not enabled' do
+        resource[:ensure] = '1:1.2.3.6-5.el4'
+        expect(provider).to_not be_insync(is)
+      end
+    end
+  end
+
+  describe 'rpm multiversion to hash' do
+    it 'should return empty hash for empty imput' do
+      package_hash = described_class.nevra_to_multiversion_hash('')
+      expect(package_hash).to eq({})
+    end
+
+    it 'should return package hash for one package input' do
+      package_list = <<-RPM_OUTPUT
+kernel-devel 1 1.2.3.4 5.el4 x86_64
+RPM_OUTPUT
+      package_hash = described_class.nevra_to_multiversion_hash(package_list)
+      expect(package_hash).to eq(
+        {
+          :arch => "x86_64",
+          :ensure => "1:1.2.3.4-5.el4",
+          :epoch => "1",
+          :name => "kernel-devel",
+          :provider => :rpm,
+          :release => "5.el4",
+          :version => "1.2.3.4",
+        }
+      )
+    end
+
+    it 'should return package hash with versions concatenated in ensure for two package input' do
+      package_list = <<-RPM_OUTPUT
+kernel-devel 1 1.2.3.4 5.el4 x86_64
+kernel-devel 1 5.6.7.8 5.el4 x86_64
+RPM_OUTPUT
+      package_hash = described_class.nevra_to_multiversion_hash(package_list)
+      expect(package_hash).to eq(
+        {
+          :arch => "x86_64",
+          :ensure => "1:1.2.3.4-5.el4; 1:5.6.7.8-5.el4",
+          :epoch => "1",
+          :name => "kernel-devel",
+          :provider => :rpm,
+          :release => "5.el4",
+          :version => "1.2.3.4",
+        }
+      )
+    end
+
+    it 'should return list of packages for one multiversion and one package input' do
+      package_list = <<-RPM_OUTPUT
+kernel-devel 1 1.2.3.4 5.el4 x86_64
+kernel-devel 1 5.6.7.8 5.el4 x86_64
+basesystem 0 8.0 5.1.1.el5.centos noarch
+RPM_OUTPUT
+      package_hash = described_class.nevra_to_multiversion_hash(package_list)
+      expect(package_hash).to eq(
+        [
+          {
+            :arch => "x86_64",
+            :ensure => "1:1.2.3.4-5.el4; 1:5.6.7.8-5.el4",
+            :epoch => "1",
+            :name => "kernel-devel",
+            :provider => :rpm,
+            :release => "5.el4",
+            :version => "1.2.3.4",
+          },
+          {
+            :provider => :rpm,
+            :name => "basesystem",
+            :epoch => "0",
+            :version => "8.0",
+            :release => "5.1.1.el5.centos",
+            :arch => "noarch",
+            :ensure => "8.0-5.1.1.el5.centos",
+          }
+        ]
+      )
+    end
+  end
 end