SuSEFirewall maintain cached if the packages are already installed.

yast · Oct 6, 2017 · ac6c4f2 · ac6c4f2
1 parent 03f7e6b
commit ac6c4f2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/library/network/src/lib/network/susefirewall.rb b/library/network/src/lib/network/susefirewall.rb
@@ -537,11 +537,13 @@ def IsKnownZone(zone)
     #
     # @return [Boolean] whether the selected firewall backend is installed
     def SuSEFirewallIsSelectedOrInstalled
+      return true if @needed_packages_installed
+
       if Stage.initial
-        @needed_packages_selected = Pkg.IsSelected(@FIREWALL_PACKAGE)
-        log.info "Selected for installation -> #{@needed_packages_installed}"
+        packages_selected = Pkg.IsSelected(@FIREWALL_PACKAGE)
+        log.info "Selected for installation -> #{packages_selected}"
 
-        return true if @needed_packages_selected
+        return true if packages_selected
       end
 
       SuSEFirewallIsInstalled()
@@ -551,6 +553,8 @@ def SuSEFirewallIsSelectedOrInstalled
     #
     # @return [Boolean] whether the selected firewall backend is installed
     def SuSEFirewallIsInstalled
+      return true if @needed_packages_installed
+
       if Mode.normal
         @needed_packages_installed = PackageSystem.CheckAndInstallPackages([@FIREWALL_PACKAGE])
         log.info "CheckAndInstallPackages -> #{@needed_packages_installed}"

diff --git a/library/network/test/susefirewall_test.rb b/library/network/test/susefirewall_test.rb
@@ -32,6 +32,8 @@ def reset_SuSEFirewallIsInstalled_cache
 
         expect(subject.SuSEFirewallIsInstalled).to eq(false)
         expect(subject.SuSEFirewallIsInstalled).to eq(true)
+        # Value is cached if true
+        expect(subject.SuSEFirewallIsInstalled).to eq(true)
       end
     end
 
@@ -43,6 +45,11 @@ def reset_SuSEFirewallIsInstalled_cache
         expect(Yast::PackageSystem).to receive(:CheckAndInstallPackages).and_return(true, false).twice
 
         expect(subject.SuSEFirewallIsInstalled).to eq(true)
+        # Value is cached if true
+        expect(subject.SuSEFirewallIsInstalled).to eq(true)
+
+        reset_SuSEFirewallIsInstalled_cache
+
         expect(subject.SuSEFirewallIsInstalled).to eq(false)
       end
     end