Fix NTP server detection after aborting installation

yast · Apr 21, 2017 · c91a919 · c91a919
1 parent cedb864
commit c91a919
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/lib/installation/widgets/ntp_server.rb b/src/lib/installation/widgets/ntp_server.rb
@@ -57,12 +57,7 @@ def store
 
       # Initializes the widget's value
       def init
-        saved_servers =
-          if role["ntp_servers"] && !role["ntp_servers"].empty?
-            role["ntp_servers"]
-          else
-            default_servers
-          end
+        saved_servers = role["ntp_servers"] || default_servers
         self.value = saved_servers.join(" ")
       end
 

diff --git a/test/inst_casp_overview_test.rb b/test/inst_casp_overview_test.rb
@@ -74,7 +74,7 @@ def label
         .with("inst_doit", []).and_return(:next)
       allow(File).to receive(:exist?).and_call_original
       allow(File).to receive(:exist?).with("/info.txt").and_return(false)
-      expect(Yast::SlpService).to receive(:all).and_return(ntp_servers)
+      allow(Yast::SlpService).to receive(:all).and_return(ntp_servers)
     end
 
     it "sets package locale same as Language" do