Hello community, here is the log from the commit of package yast2-dns-server for openSUSE:Factory checked in at 2018-07-27 10:56:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-dns-server (Old) and /work/SRC/openSUSE:Factory/.yast2-dns-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dns-server" Fri Jul 27 10:56:54 2018 rev:74 rq:625389 version:4.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-dns-server/yast2-dns-server.changes 2018-06-29 22:37:23.261950401 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-dns-server.new/yast2-dns-server.changes 2018-07-27 10:58:09.189865996 +0200 @@ -1,0 +2,7 @@ +Wed Jul 25 18:20:26 UTC 2018 - [email protected] + +- Reload the configuration only if the service is running but do + not restart the service. (bsc#1102235) +- 4.0.4 + +------------------------------------------------------------------- Old: ---- yast2-dns-server-4.0.3.tar.bz2 New: ---- yast2-dns-server-4.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dns-server.spec ++++++ --- /var/tmp/diff_new_pack.k4AMOX/_old 2018-07-27 10:58:09.629866838 +0200 +++ /var/tmp/diff_new_pack.k4AMOX/_new 2018-07-27 10:58:09.633866845 +0200 @@ -17,7 +17,7 @@ Name: yast2-dns-server -Version: 4.0.3 +Version: 4.0.4 Release: 0 Url: https://github.com/yast/yast-dns-server ++++++ yast2-dns-server-4.0.3.tar.bz2 -> yast2-dns-server-4.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.0.3/package/yast2-dns-server.changes new/yast2-dns-server-4.0.4/package/yast2-dns-server.changes --- old/yast2-dns-server-4.0.3/package/yast2-dns-server.changes 2018-06-29 16:32:15.000000000 +0200 +++ new/yast2-dns-server-4.0.4/package/yast2-dns-server.changes 2018-07-26 11:46:52.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 25 18:20:26 UTC 2018 - [email protected] + +- Reload the configuration only if the service is running but do + not restart the service. (bsc#1102235) +- 4.0.4 + +------------------------------------------------------------------- Tue Jun 26 16:51:49 CEST 2018 - [email protected] - Added additional searchkeys to desktop file (fate#321043). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.0.3/package/yast2-dns-server.spec new/yast2-dns-server-4.0.4/package/yast2-dns-server.spec --- old/yast2-dns-server-4.0.3/package/yast2-dns-server.spec 2018-06-29 16:32:15.000000000 +0200 +++ new/yast2-dns-server-4.0.4/package/yast2-dns-server.spec 2018-07-26 11:46:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-dns-server -Version: 4.0.3 +Version: 4.0.4 Release: 0 Url: https://github.com/yast/yast-dns-server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.0.3/src/include/dns-server/dialog-installwizard.rb new/yast2-dns-server-4.0.4/src/include/dns-server/dialog-installwizard.rb --- old/yast2-dns-server-4.0.3/src/include/dns-server/dialog-installwizard.rb 2018-06-29 16:32:15.000000000 +0200 +++ new/yast2-dns-server-4.0.4/src/include/dns-server/dialog-installwizard.rb 2018-07-26 11:46:52.000000000 +0200 @@ -189,7 +189,6 @@ Left( RadioButtonGroup( Id("dns_server_type"), - Opt(:shrinkable), VBox( # Radiobutton label - DNS starting Left( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.0.3/src/include/dns-server/dialog-main.rb new/yast2-dns-server-4.0.4/src/include/dns-server/dialog-main.rb --- old/yast2-dns-server-4.0.3/src/include/dns-server/dialog-main.rb 2018-06-29 16:32:15.000000000 +0200 +++ new/yast2-dns-server-4.0.4/src/include/dns-server/dialog-main.rb 2018-07-26 11:46:52.000000000 +0200 @@ -1881,13 +1881,7 @@ Wizard.RestoreHelp(Ops.get_string(@HELPS, "write", "")) ret = DnsServer.Write if ret - if status_widget.reload_flag? - if service.running? - service.reload - else - service.restart - end - end + service.reload if service.running? && status_widget.reload_flag? :next else if Popup.YesNo(_("Saving the configuration failed. Change the settings?")) @@ -1904,7 +1898,7 @@ Wizard.RestoreHelp(Ops.get_string(@HELPS, "write", "")) ret = DnsServer.Write if ret - service.reload if status_widget.reload_flag? + service.reload if service.running? && status_widget.reload_flag? else Report.Error(_("Saving the configuration failed")) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.0.3/test/main_test.rb new/yast2-dns-server-4.0.4/test/main_test.rb --- old/yast2-dns-server-4.0.3/test/main_test.rb 2018-06-29 16:32:15.000000000 +0200 +++ new/yast2-dns-server-4.0.4/test/main_test.rb 2018-07-26 11:46:52.000000000 +0200 @@ -23,22 +23,74 @@ end describe "#WriteDialog" do - it "reloads running named.service" do - m = CurrentDialogMain.new - expect(Yast::DnsServer).to receive(:Write).and_return true - expect(m.service).to receive(:running?).and_return true - expect(m.status_widget).to receive(:reload_flag?).and_return true - expect(m.service).to receive(:reload) - expect(m.WriteDialog ).to eq(:next) + let(:m) { CurrentDialogMain.new } + let(:written) { false } + let(:running) { true } + + before do + allow(Yast::DnsServer).to receive(:Write).and_return written + allow(m.service).to receive(:running?).and_return running + end + + it "writes the DNS configuration" do + expect(Yast::DnsServer).to receive(:Write).and_return written + m.WriteDialog end - it "restarts not running named.service" do - m = CurrentDialogMain.new - expect(Yast::DnsServer).to receive(:Write).and_return true - expect(m.service).to receive(:running?).and_return false - expect(m.status_widget).to receive(:reload_flag?).and_return true - expect(m.service).to receive(:restart) - expect(m.WriteDialog ).to eq(:next) + context "when the configuration is written" do + let(:written) { true } + + context "and the named service is running" do + context "and the config is marked to be reloaded" do + it "reloads the service" do + expect(m.status_widget).to receive(:reload_flag?).and_return true + expect(m.service).to receive(:reload) + expect(m.WriteDialog ).to eq(:next) + end + end + + context "and the config is not marked to be reloaded" do + it "does not restart nor reload the service" do + expect(m.status_widget).to receive(:reload_flag?).and_return false + expect(m.service).to_not receive(:reload) + expect(m.service).to_not receive(:restart) + expect(m.WriteDialog ).to eq(:next) + end + end + end + + context "and the named service is not running" do + let(:running) { false} + + before do + allow(m.status_widget).to receive(:reload_flag?).and_return true + end + + it "does not restart nor reload the service" do + expect(m.service).to_not receive(:restart) + expect(m.service).to_not receive(:reload) + expect(m.WriteDialog ).to eq(:next) + end + end + end + + context "when the configuration is not written" do + let(:written) { false } + + it "aks for changing the current settings" do + expect(Yast::Popup).to receive(:YesNo) + m.WriteDialog + end + + it "returns :back if decided to change the current settings" do + expect(Yast::Popup).to receive(:YesNo).and_return true + expect(m.WriteDialog).to eq(:back) + end + + it "returns :abort if canceled" do + expect(Yast::Popup).to receive(:YesNo).and_return false + expect(m.WriteDialog).to eq(:abort) + end end end
