diff options
author | Lamont Granquist <454857+lamont-granquist@users.noreply.github.com> | 2021-12-06 11:57:09 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-06 11:57:09 -0800 |
commit | 7c7b18ef5634f8bc88ed8ba54a0132b6bc1c8cb0 (patch) | |
tree | dfad3fcfd354a6f5436b8aff2838c2c770decf74 | |
parent | 5f85c0515e9d46a46fec123a8b8e19a94a3e37af (diff) | |
parent | b67a14db3868087e9d90c9b1cd410190ac254eac (diff) | |
download | chef-7c7b18ef5634f8bc88ed8ba54a0132b6bc1c8cb0.tar.gz |
Merge pull request #12347 from chef/lcg/dnf-spec-cleanup
-rw-r--r-- | spec/functional/resource/dnf_package_spec.rb | 212 |
1 files changed, 106 insertions, 106 deletions
diff --git a/spec/functional/resource/dnf_package_spec.rb b/spec/functional/resource/dnf_package_spec.rb index 35af5d5c1a..860eb2f999 100644 --- a/spec/functional/resource/dnf_package_spec.rb +++ b/spec/functional/resource/dnf_package_spec.rb @@ -87,7 +87,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") end it "does not install if the package is installed" do @@ -104,12 +104,12 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") end it "does not install if the prior version package is installed" do @@ -118,7 +118,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end it "does not install if the i686 package is installed", :intel_64bit do @@ -128,7 +128,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.i686$") + expect_matching_installed_version("^chef_rpm-1.10-1.i686$") end it "does not install if the prior version i686 package is installed", :intel_64bit do @@ -138,7 +138,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.i686$") + expect_matching_installed_version("^chef_rpm-1.2-1.i686$") end end @@ -221,7 +221,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version vstring action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end end @@ -233,7 +233,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version vstring action :upgrade end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end end @@ -245,7 +245,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version vstring action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options version vstring @@ -262,7 +262,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm-1.10" do options default_options action :install @@ -275,7 +275,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm-1.2" do options default_options action :install @@ -288,7 +288,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm-0:1.2-1.#{pkg_arch}" do options default_options action :install @@ -301,7 +301,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm-1.2-1" do options default_options action :install @@ -314,7 +314,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm-1*" do options default_options action :install @@ -327,7 +327,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rp*-1*" do options default_options action :install @@ -340,7 +340,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}") dnf_package "chef_rpm-1.10" do options default_options action :install @@ -353,7 +353,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm-1.2" do options default_options action :install @@ -370,7 +370,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.10" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options version "1.10" @@ -385,7 +385,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1*" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options version "1*" @@ -400,7 +400,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.10-1" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options version "1.10-1" @@ -415,7 +415,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "0:1.10-1" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options version "0:1.10-1" @@ -430,7 +430,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.10-1*" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options version "1.10-1*" @@ -445,7 +445,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "0:1.10-1*" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options version "0:1.10-1*" @@ -463,7 +463,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.2-1" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options version "1.2-1" @@ -480,7 +480,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.2-1" action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") end end @@ -491,7 +491,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm.#{pkg_arch}" do options default_options action :install @@ -504,7 +504,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.i686$") + expect_matching_installed_version("^chef_rpm-1.10-1.i686$") dnf_package "chef_rpm.i686" do options default_options action :install @@ -518,7 +518,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do arch pkg_arch action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options arch pkg_arch @@ -533,7 +533,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do arch "i686" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.i686$") + expect_matching_installed_version("^chef_rpm-1.10-1.i686$") dnf_package "chef_rpm" do options default_options arch "i686" @@ -548,7 +548,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.10-1" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.i686$") + expect_matching_installed_version("^chef_rpm-1.10-1.i686$") dnf_package "chef_rpm.i686" do options default_options version "1.10-1" @@ -563,7 +563,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.10-1" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm.#{pkg_arch}" do options default_options version "1.10-1" @@ -579,7 +579,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm >= 1.2" do options default_options action :install @@ -592,7 +592,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end it "when it is met, it does nothing" do @@ -601,7 +601,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") end it "with nothing installed, it installs the latest version" do @@ -610,7 +610,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm > 1.2" do options default_options action :install @@ -623,7 +623,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm > 1.2" do options default_options action :install @@ -636,7 +636,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm = 1.10" do options default_options action :install @@ -649,7 +649,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end it "when it is met by an installed rpm, it does nothing" do @@ -658,7 +658,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") end it "when there is no solution to the contraint" do @@ -681,7 +681,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm < 1.10" do options default_options action :install @@ -694,7 +694,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end it "with a less than constraint, when the install version fails, it should downgrade" do @@ -703,7 +703,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm < 1.10" do options default_options action :install @@ -737,7 +737,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do name "something" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "something" do source("#{CHEF_SPEC_ASSETS}/yumrepo/chef_rpm-1.2-1.#{pkg_arch}.rpm") options default_options @@ -753,7 +753,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "#{CHEF_SPEC_ASSETS}/yumrepo/chef_rpm-1.2-1.#{pkg_arch}.rpm" do options default_options action :install @@ -767,7 +767,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.2-1" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "#{CHEF_SPEC_ASSETS}/yumrepo/chef_rpm-1.2-1.#{pkg_arch}.rpm" do options default_options version "1.2-1" @@ -783,7 +783,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.2-1" action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") end it "does not downgrade the package with :install" do @@ -792,7 +792,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") end it "does not upgrade the package with :install" do @@ -801,7 +801,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end it "is idempotent when the package is already installed" do @@ -810,7 +810,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end it "is idempotent when the package is already installed and there is a version string" do @@ -820,7 +820,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.2-1" action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end end @@ -832,7 +832,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options "--nogpgcheck --disablerepo=*" action :install end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end it "works with a local source" do @@ -842,7 +842,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options "--nogpgcheck --disablerepo=*" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "#{CHEF_SPEC_ASSETS}/yumrepo/chef_rpm-1.2-1.#{pkg_arch}.rpm" do options "--nogpgcheck --disablerepo=*" action :install @@ -857,8 +857,8 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match(/^chef_rpm-1.10-1.#{pkg_arch}$/) - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match(/^chef_rpm-1.10-1.i686$/) + expect_matching_installed_version(/^chef_rpm-1.10-1.#{pkg_arch}$/) + expect_matching_installed_version(/^chef_rpm-1.10-1.i686$/) dnf_package [ "chef_rpm.#{pkg_arch}", "chef_rpm.i686" ] do options default_options action :install @@ -880,8 +880,8 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match(/^chef_rpm-1.10-1.#{pkg_arch}$/) - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match(/^chef_rpm-1.10-1.i686$/) + expect_matching_installed_version(/^chef_rpm-1.10-1.#{pkg_arch}$/) + expect_matching_installed_version(/^chef_rpm-1.10-1.i686$/) dnf_package [ "chef_rpm.#{pkg_arch}", "chef_rpm.i686" ] do options default_options action :install @@ -894,8 +894,8 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match(/^chef_rpm-1.10-1.#{pkg_arch}$/) - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match(/^chef_rpm-1.10-1.i686$/) + expect_matching_installed_version(/^chef_rpm-1.10-1.#{pkg_arch}$/) + expect_matching_installed_version(/^chef_rpm-1.10-1.i686$/) dnf_package [ "chef_rpm.#{pkg_arch}", "chef_rpm.i686" ] do options default_options action :install @@ -910,8 +910,8 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do arch [pkg_arch, "i686"] action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match(/^chef_rpm-1.10-1.#{pkg_arch}$/) - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match(/^chef_rpm-1.10-1.i686$/) + expect_matching_installed_version(/^chef_rpm-1.10-1.#{pkg_arch}$/) + expect_matching_installed_version(/^chef_rpm-1.10-1.i686$/) dnf_package %w{chef_rpm chef_rpm} do options default_options arch [pkg_arch, "i686"] @@ -927,8 +927,8 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do arch [pkg_arch, "i686"] action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match(/^chef_rpm-1.10-1.#{pkg_arch}$/) - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match(/^chef_rpm-1.10-1.i686$/) + expect_matching_installed_version(/^chef_rpm-1.10-1.#{pkg_arch}$/) + expect_matching_installed_version(/^chef_rpm-1.10-1.i686$/) dnf_package %w{chef_rpm chef_rpm} do options default_options action :install @@ -943,8 +943,8 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do arch [pkg_arch, "i686"] action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match(/^chef_rpm-1.10-1.#{pkg_arch}$/) - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match(/^chef_rpm-1.10-1.i686$/) + expect_matching_installed_version(/^chef_rpm-1.10-1.#{pkg_arch}$/) + expect_matching_installed_version(/^chef_rpm-1.10-1.i686$/) dnf_package %w{chef_rpm chef_rpm} do options default_options action :install @@ -979,7 +979,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options ["--nogpgcheck", "--disablerepo=*", "--enablerepo=chef-dnf-localtesting"] action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options ["--nogpgcheck", "--disablerepo=*", "--enablerepo=chef-dnf-localtesting"] action :install @@ -1000,7 +1000,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options "--nogpgcheck --enablerepo=chef-dnf-localtesting" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options "--nogpgcheck --enablerepo=chef-dnf-localtesting" action :install @@ -1018,14 +1018,14 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options "--nogpgcheck --disablerepo=chef-dnf-localtesting" action :upgrade end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") # now we're still using the same cache in the dnf_helper.py cache and we test to see if the # repo that we temporarily disabled is enabled on this pass. dnf_package "chef_rpm-1.10-1.#{pkg_arch}" do options "--nogpgcheck" action :install end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm-1.10-1.#{pkg_arch}" do options "--nogpgcheck" action :install @@ -1061,7 +1061,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do source("#{CHEF_SPEC_ASSETS}/yumrepo/chef_rpm-1.2-1.#{pkg_arch}.rpm") action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "something" do options default_options package_name "somethingelse" @@ -1076,7 +1076,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "#{CHEF_SPEC_ASSETS}/yumrepo/chef_rpm-1.2-1.#{pkg_arch}.rpm" do options default_options action :upgrade @@ -1089,7 +1089,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "#{CHEF_SPEC_ASSETS}/yumrepo/chef_rpm-1.2-1.#{pkg_arch}.rpm" do options default_options action :upgrade @@ -1103,7 +1103,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do allow_downgrade false action :upgrade end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") end it "upgrades the package" do @@ -1112,7 +1112,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "#{CHEF_SPEC_ASSETS}/yumrepo/chef_rpm-1.10-1.#{pkg_arch}.rpm" do options default_options action :upgrade @@ -1125,7 +1125,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end end @@ -1137,7 +1137,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options "--nogpgcheck --disablerepo=*" action :upgrade end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end it "works with a local source" do @@ -1147,7 +1147,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options "--nogpgcheck --disablerepo=*" action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "#{CHEF_SPEC_ASSETS}/yumrepo/chef_rpm-1.2-1.#{pkg_arch}.rpm" do options default_options action :upgrade @@ -1163,7 +1163,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.10-1" action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options version "1.10-1" @@ -1178,7 +1178,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.2-1" action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options version "1.2-1" @@ -1193,7 +1193,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version "1.10" action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options version "1.10" @@ -1208,7 +1208,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do version("1.2") action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm" do options default_options version("1.2") @@ -1222,7 +1222,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm-1.10-1" do options default_options action :upgrade @@ -1235,7 +1235,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm-1.2-1" do options default_options action :upgrade @@ -1248,7 +1248,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm-1.10" do options default_options action :upgrade @@ -1261,7 +1261,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm-1.2" do options default_options action :upgrade @@ -1274,7 +1274,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm = 1.10" do options default_options action :upgrade @@ -1287,7 +1287,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm = 1.2" do options default_options action :upgrade @@ -1300,7 +1300,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm > 1.2" do options default_options action :upgrade @@ -1313,7 +1313,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm < 1.10" do options default_options action :upgrade @@ -1326,7 +1326,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") end it "with a < pin in the name and no rpm installed it installs" do @@ -1335,7 +1335,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") end it "with a > pin in the name and non-matching rpm installed it upgrades" do @@ -1344,7 +1344,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm > 1.2" do options default_options action :upgrade @@ -1357,7 +1357,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :upgrade end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.2-1.#{pkg_arch}$") dnf_package "chef_rpm < 1.10" do options default_options action :upgrade @@ -1374,7 +1374,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :remove end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$") + expect_matching_installed_version("^package chef_rpm is not installed$") end it "removes the package if the package is installed" do @@ -1383,7 +1383,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :remove end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$") + expect_matching_installed_version("^package chef_rpm is not installed$") end it "does not remove the package twice" do @@ -1392,12 +1392,12 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :remove end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$") + expect_matching_installed_version("^package chef_rpm is not installed$") dnf_package "chef_rpm" do options default_options action :remove end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$") + expect_matching_installed_version("^package chef_rpm is not installed$") end it "removes the package if the prior version package is installed" do @@ -1406,7 +1406,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :remove end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$") + expect_matching_installed_version("^package chef_rpm is not installed$") dnf_package "chef_rpm" do options default_options action :remove @@ -1420,7 +1420,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :remove end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$") + expect_matching_installed_version("^package chef_rpm is not installed$") dnf_package "chef_rpm" do options default_options action :remove @@ -1434,7 +1434,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :remove end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$") + expect_matching_installed_version("^package chef_rpm is not installed$") dnf_package "chef_rpm" do options default_options action :remove @@ -1449,7 +1449,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :remove end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$") + expect_matching_installed_version("^package chef_rpm is not installed$") end it "removes the package if the package is installed" do @@ -1458,7 +1458,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :remove end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$") + expect_matching_installed_version("^package chef_rpm is not installed$") dnf_package "chef_rpm.#{pkg_arch}" do options default_options action :remove @@ -1471,7 +1471,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :remove end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$") + expect_matching_installed_version("^package chef_rpm is not installed$") dnf_package "chef_rpm.#{pkg_arch}" do options default_options action :remove @@ -1484,7 +1484,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :remove end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.i686$") + expect_matching_installed_version("^chef_rpm-1.10-1.i686$") end it "does nothing if the prior version i686 package is installed" do @@ -1493,7 +1493,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :remove end.should_not_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.i686$") + expect_matching_installed_version("^chef_rpm-1.2-1.i686$") end end @@ -1504,7 +1504,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options default_options action :remove end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") + expect_matching_installed_version("^chef_rpm-1.10-1.#{pkg_arch}$") dnf_package "chef_rpm.i686" do options default_options action :remove @@ -1520,7 +1520,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do options "--nogpgcheck --disablerepo=*" action :remove end.should_be_updated - expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$") + expect_matching_installed_version("^package chef_rpm is not installed$") dnf_package "chef_rpm" do options "--nogpgcheck --disablerepo=*" action :remove |