From 3f6342ffc4b0af63c157d9f93d80ead5629161d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 21 Apr 2020 16:27:16 +0200 Subject: [PATCH 1/3] Adapt Rakefile and Dockerfile for SLE-15-SP2 --- Dockerfile | 2 +- Rakefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 94abc860..159e190b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest +FROM registry.opensuse.org/yast/sle-15/sp2/containers/yast-ruby COPY . /usr/src/app diff --git a/Rakefile b/Rakefile index f01c38f1..2331b761 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,7 @@ require "yast/rake" +Yast::Tasks.submit_to :sle15sp2 + Yast::Tasks.configuration do |conf| # lets ignore license check for now conf.skip_license_check << /.*/ From 35460e501245896bbe7f5de39e64c51789fe0874 Mon Sep 17 00:00:00 2001 From: Knut Anderssen Date: Tue, 4 May 2021 11:17:38 +0100 Subject: [PATCH 2/3] Fix proposal dhcp_ntp_servers call --- src/clients/ntp-client_proposal.rb | 2 +- test/ntp_client_proposal_test.rb | 29 +++++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/clients/ntp-client_proposal.rb b/src/clients/ntp-client_proposal.rb index 8805db2b..9d675a6d 100644 --- a/src/clients/ntp-client_proposal.rb +++ b/src/clients/ntp-client_proposal.rb @@ -60,7 +60,7 @@ def main NtpClient.ntp_selected = Ops.get_boolean(@param, "ntp_used", false) @ret = true when "dhcp_ntp_servers" - @ret = NtpClient.dhcp_ntp_servers + @ret = NtpClient.dhcp_ntp_servers.map(&:hostname) when "MakeProposal" @ret = MakeProposal() when "Write" diff --git a/test/ntp_client_proposal_test.rb b/test/ntp_client_proposal_test.rb index 65954ebe..5401a1cc 100755 --- a/test/ntp_client_proposal_test.rb +++ b/test/ntp_client_proposal_test.rb @@ -13,15 +13,36 @@ client end + let(:dhcp_ntp_servers) { [] } + + before do + allow(Yast::Lan).to receive(:dhcp_ntp_servers) + .and_return(dhcp_ntp_servers) + end + + describe "#main" do + let(:client) { described_class.new } + let(:func) { "dhcp_ntp_servers" } + + before do + allow(Yast::WFM).to receive(:Args).with(no_args).and_return([func]) + allow(Yast::WFM).to receive(:Args).with(0).and_return(func) + end + + context "when call with 'dhcp_ntp_servers' argument" do + let(:dhcp_ntp_servers) { ["test.example.net", "test2.example.net"] } + + it "returns servers found via DHCP" do + expect(client.main).to eql(dhcp_ntp_servers) + end + end + end + describe "#MakeProposal" do - let(:dhcp_ntp_servers) { [] } let(:config_was_read?) { false } let(:ntp_was_selected?) { false } before do - allow(Yast::Lan).to receive(:dhcp_ntp_servers) - .and_return(dhcp_ntp_servers) - allow(Yast::NtpClient).to receive(:country_ntp_servers).with("de") .and_return([Y2Network::NtpServer.new("de.pool.ntp.org")]) allow(Yast::Timezone).to receive(:timezone).and_return("Europe/Berlin") From 4d3e828e17fe36487557755e19ac840c623a4171 Mon Sep 17 00:00:00 2001 From: Knut Anderssen Date: Tue, 4 May 2021 11:27:50 +0100 Subject: [PATCH 3/3] Bump version & changelog --- package/yast2-ntp-client.changes | 6 ++++++ package/yast2-ntp-client.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/yast2-ntp-client.changes b/package/yast2-ntp-client.changes index 61a6c562..2adbd1ea 100644 --- a/package/yast2-ntp-client.changes +++ b/package/yast2-ntp-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 4 10:22:49 UTC 2021 - Knut Anderssen + +- Adapted proposal client returning the dhcp ntp servers as strings +- 4.2.12 (bsc#1185545) + ------------------------------------------------------------------- Mon Mar 23 14:19:10 CET 2020 - schubi@suse.de diff --git a/package/yast2-ntp-client.spec b/package/yast2-ntp-client.spec index b205a6ed..a414fe98 100644 --- a/package/yast2-ntp-client.spec +++ b/package/yast2-ntp-client.spec @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 4.2.11 +Version: 4.2.12 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0-or-later