From: Simon Deziel <simon@sdeziel.info>
Date: Fri, 19 Oct 2018 20:36:54 +0000 (-0400)
Subject: (MODULES-8081): improve variable assignment/condition testing in apt_key_provider_spec.rb
X-Git-Tag: 6.2.0~4^2~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8204a287590180695d61353d75676114d4e7a8ac;p=puppet-modules%2Fpuppetlabs-apt.git

(MODULES-8081): improve variable assignment/condition testing in apt_key_provider_spec.rb
---

diff --git a/spec/acceptance/apt_key_provider_spec.rb b/spec/acceptance/apt_key_provider_spec.rb
index 219983c..ea24528 100644
--- a/spec/acceptance/apt_key_provider_spec.rb
+++ b/spec/acceptance/apt_key_provider_spec.rb
@@ -478,11 +478,8 @@ hkp_pool_pp = <<-MANIFEST
         }
   MANIFEST
 
-if fact('operatingsystem') =~ %r{Ubuntu} && fact('operatingsystemrelease') =~ %r{^18\.04}
-  hkps_protocol_supported = true
-else
-  hkps_protocol_supported = false
-end
+hkps_protocol_supported = fact('operatingsystem') =~ %r{Ubuntu} && \
+                            fact('operatingsystemrelease') =~ %r{^18\.04}
 
 if hkps_protocol_supported
   hkps_ubuntu_pp = <<-MANIFEST