diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/functional/resource/dnf_package_spec.rb | 4 | ||||
| -rw-r--r-- | spec/support/chef_helpers.rb | 2 | ||||
| -rw-r--r-- | spec/unit/mixin/openssl_helper_spec.rb | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/spec/functional/resource/dnf_package_spec.rb b/spec/functional/resource/dnf_package_spec.rb index e10dff4496..d8618a5dee 100644 --- a/spec/functional/resource/dnf_package_spec.rb +++ b/spec/functional/resource/dnf_package_spec.rb @@ -726,7 +726,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do it "with a prco equality pin in the name it upgrades a prior package" do preinstall("chef_rpm-1.2-1.#{pkg_arch}.rpm") - dnf_package.package_name("chef_rpm == 1.10") + dnf_package.package_name("chef_rpm = 1.10") dnf_package.run_action(:upgrade) expect(dnf_package.updated_by_last_action?).to be true expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$") @@ -742,7 +742,7 @@ describe Chef::Resource::DnfPackage, :requires_root, external: exclude_test do it "with a prco equality pin in the name it downgrades a later package" do preinstall("chef_rpm-1.10-1.#{pkg_arch}.rpm") - dnf_package.package_name("chef_rpm == 1.2") + dnf_package.package_name("chef_rpm = 1.2") dnf_package.run_action(:upgrade) expect(dnf_package.updated_by_last_action?).to be true expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$") diff --git a/spec/support/chef_helpers.rb b/spec/support/chef_helpers.rb index 88c4524e97..c566ced8b1 100644 --- a/spec/support/chef_helpers.rb +++ b/spec/support/chef_helpers.rb @@ -27,7 +27,7 @@ Chef::Log.level(Chef::Config.log_level) Chef::Config.solo(false) def sha256_checksum(path) - OpenSSL::Digest::SHA256.hexdigest(File.read(path)) + OpenSSL::Digest.hexdigest("SHA256", File.read(path)) end # extracted from Ruby < 2.5 to return a unique temp file name without creating it diff --git a/spec/unit/mixin/openssl_helper_spec.rb b/spec/unit/mixin/openssl_helper_spec.rb index 79d9a809f9..1cd3960757 100644 --- a/spec/unit/mixin/openssl_helper_spec.rb +++ b/spec/unit/mixin/openssl_helper_spec.rb @@ -488,7 +488,7 @@ describe Chef::Mixin::OpenSSLHelper do @ca_cert.add_extension(ef.create_extension("keyUsage", "keyCertSign, cRLSign", true)) @ca_cert.add_extension(ef.create_extension("subjectKeyIdentifier", "hash", false)) @ca_cert.add_extension(ef.create_extension("authorityKeyIdentifier", "keyid:always", false)) - @ca_cert.sign(@ca_key, OpenSSL::Digest::SHA256.new) + @ca_cert.sign(@ca_key, OpenSSL::Digest.new("SHA256")) @info_with_issuer = { "validity" => 365, "issuer" => @ca_cert } @info_without_issuer = { "validity" => 365 } @@ -614,7 +614,7 @@ describe Chef::Mixin::OpenSSLHelper do @ca_cert.add_extension(ef.create_extension("keyUsage", "keyCertSign, cRLSign", true)) @ca_cert.add_extension(ef.create_extension("subjectKeyIdentifier", "hash", false)) @ca_cert.add_extension(ef.create_extension("authorityKeyIdentifier", "keyid:always", false)) - @ca_cert.sign(@ca_key, OpenSSL::Digest::SHA256.new) + @ca_cert.sign(@ca_key, OpenSSL::Digest.new("SHA256")) @info = { "validity" => 8, "issuer" => @ca_cert } end @@ -684,7 +684,7 @@ describe Chef::Mixin::OpenSSLHelper do @ca_cert.add_extension(ef.create_extension("keyUsage", "keyCertSign, cRLSign", true)) @ca_cert.add_extension(ef.create_extension("subjectKeyIdentifier", "hash", false)) @ca_cert.add_extension(ef.create_extension("authorityKeyIdentifier", "keyid:always", false)) - @ca_cert.sign(@ca_key, OpenSSL::Digest::SHA256.new) + @ca_cert.sign(@ca_key, OpenSSL::Digest.new("SHA256")) @info = { "validity" => 8, "issuer" => @ca_cert } @@ -765,7 +765,7 @@ describe Chef::Mixin::OpenSSLHelper do @ca_cert.add_extension(ef.create_extension("keyUsage", "keyCertSign, cRLSign", true)) @ca_cert.add_extension(ef.create_extension("subjectKeyIdentifier", "hash", false)) @ca_cert.add_extension(ef.create_extension("authorityKeyIdentifier", "keyid:always", false)) - @ca_cert.sign(@ca_key, OpenSSL::Digest::SHA256.new) + @ca_cert.sign(@ca_key, OpenSSL::Digest.new("SHA256")) @info = { "validity" => 8, "issuer" => @ca_cert } |