fix the "support matrix"

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

1 files changed, 8 insertions, 12 deletions

diff --git a/spec/functional/resource/yum_package_spec.rb b/spec/functional/resource/yum_package_spec.rb
index 0f54575cfe..2135d23341 100644
--- a/spec/functional/resource/yum_package_spec.rb
+++ b/spec/functional/resource/yum_package_spec.rb
@@ -141,9 +141,8 @@ describe Chef::Resource::YumPackage, :requires_root, external: exclude_test do
     end
 
     context "expanded idempotency checks with version variants" do
-      # 0:1.10, 0:1.10-1, 0:1*-1 don't work on yum/el6
-      # %w{1.10 1* 1.10-1 1*-1 1.10-* 1*-* 0:1* *:1.10-* *:1*-*}.each do |vstring|
-      %w{1.10 1* 1.10-1 1*-1 1.10-* 1*-* 0:1* *:1.10-* *:1*-* 0:1.10 0:1.10-1 0:1*-1}.each do |vstring|
+      # 0:1*-1 doesn't work on yum/el6
+      %w{1.10 1* 1.10-1 1*-1 1.10-* 1*-* 0:1* *:1.10-* *:1*-* 0:1.10 0:1.10-1}.each do |vstring|
         it "installs the rpm when #{vstring} is in the package_name" do
           flush_cache
           yum_package "chef_rpm-#{vstring}" do
@@ -213,9 +212,8 @@ describe Chef::Resource::YumPackage, :requires_root, external: exclude_test do
         end
       end
 
-      # 0:1.2 0:1.2-1 0:1*-1 don't work on yum/el6
-      # %w{1.2 1* 1.2-1 1*-1 1.2-* 1*-* 0:1* *:1.2-* *:1*-*}.each do |vstring|
-      %w{1.2 1* 1.2-1 1*-1 1.2-* 1*-* 0:1* *:1.2-* *:1*-* 0:1.2 0:1.2-1 0:1*-1}.each do |vstring|
+      # 0:1*-1 doesn't work on yum/el6
+      %w{1.2 1* 1.2-1 1*-1 1.2-* 1*-* 0:1* *:1.2-* *:1*-* 0:1.2 0:1.2-1}.each do |vstring|
         it "is idempotent when #{vstring} is in the version property and there is a candidate version" do
           preinstall("chef_rpm-1.2-1.#{pkg_arch}.rpm")
           yum_package "chef_rpm" do
@@ -227,9 +225,8 @@ describe Chef::Resource::YumPackage, :requires_root, external: exclude_test do
         end
       end
 
-      # 0:1.2, 0:1.2-1, 0:1*-1 don't work on yum/el6
-      # %w{1.2 1.2-1 1.2-* *:1.2-*}.each do |vstring|
-      %w{1.2 1.2-1 1.2-* *:1.2-* 0:1.2 0:1.2-1 0:1*-1}.each do |vstring|
+      # 0:1.2 0:1*-1 doesn't work on yum/el6
+      %w{1.2 1.2-1 1.2-* *:1.2-* 0:1.2-1}.each do |vstring|
         it "is idempotent when #{vstring} is in the version property on upgrade and it doesn't match the candidate version" do
           preinstall("chef_rpm-1.2-1.#{pkg_arch}.rpm")
           yum_package "chef_rpm" do
@@ -241,9 +238,8 @@ describe Chef::Resource::YumPackage, :requires_root, external: exclude_test do
         end
       end
 
-      # 0:1.2, 0:1.2-1, 0:1*-1 don't work on yum/el6
-      # %w{1* 1*-1 1*-* 0:1* *:1*-*}.each do |vstring|
-      %w{1* 1*-1 1*-* 0:1* *:1*-* 0:1.2 0:1.2-1 0:1*-1}.each do |vstring|
+      # 0:1.2 0:1*-1 doesn't work on yum/el6
+      %w{1* 1*-1 1*-* 0:1* *:1*-* 0:1.2-1}.each do |vstring|
         it "upgrades when #{vstring} is in the version property on upgrade and it matches the candidate version" do
           preinstall("chef_rpm-1.2-1.#{pkg_arch}.rpm")
           yum_package "chef_rpm" do