(MODULES-8081): improve variable assignment/condition testing in apt_key_provider_spec.rb
authorSimon Deziel <simon@sdeziel.info>
Fri, 19 Oct 2018 20:36:54 +0000 (16:36 -0400)
committerSimon Deziel <simon@sdeziel.info>
Fri, 19 Oct 2018 20:36:54 +0000 (16:36 -0400)
spec/acceptance/apt_key_provider_spec.rb

index 219983cbd875993a13758e1b6d88cec1acd6131f..ea2452866c0f6675dfd466bfe85c176aaf062b5b 100644 (file)
@@ -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