From c91a9196c28f877e05b4e6dc02cee2a07bb9865f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 21 Apr 2017 14:20:27 +0100 Subject: [PATCH] Fix NTP server detection after aborting installation --- src/lib/installation/widgets/ntp_server.rb | 7 +------ test/inst_casp_overview_test.rb | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/lib/installation/widgets/ntp_server.rb b/src/lib/installation/widgets/ntp_server.rb index 50f97cede..d6e6d8156 100644 --- 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 index 0e39e82d6..22b078c2f 100755 --- 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