adapted suggestions

yast · Jun 14, 2019 · 3537f67 · 3537f67
1 parent 4d0263e
commit 3537f67
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/src/modules/NtpClient.rb b/src/modules/NtpClient.rb
@@ -94,6 +94,10 @@ def main
 
       # Service names of the NTP daemon
       @service_name = "chronyd"
+
+      # "chrony-wait" service has also to be handled in order to ensure that
+      # "chronyd" is working correctly and do not depend on the network status.
+      # bsc#1137196, bsc#1129730
       @wait_service_name = "chrony-wait"
 
       # Netconfig policy: for merging and prioritizing static and DHCP config.
@@ -595,7 +599,6 @@ def dhcp_ntp_servers
     publish variable: :synchronize_time, type: "boolean"
     publish variable: :sync_interval, type: "integer"
     publish variable: :service_name, type: "string"
-    publish variable: :wait_service_name, type: "string"
     publish variable: :ntp_policy, type: "string"
     publish variable: :ntp_selected, type: "boolean"
     publish variable: :ad_controller, type: "string"
@@ -806,26 +809,26 @@ def write_and_update_policy
     #   only mode.
     def check_service
       if @run_service
+        # Enable and run services
         if !Service.Enable(@service_name)
           Report.Error(Message.CannotAdjustService(@service_name))
         elsif !Service.Enable(@wait_service_name)
           Report.Error(Message.CannotAdjustService(@wait_service_name))
         end
-      elsif !Service.Disable(@service_name)
-        Report.Error(Message.CannotAdjustService(@service_name))
-      elsif !Service.Disable(@wait_service_name)
-        Report.Error(Message.CannotAdjustService(@wait_service_name))
-      end
-
-      if @run_service
-        unless @write_only
+        if !@write_only
           if !Service.Restart(@service_name)
             Report.Error(_("Cannot restart \"%s\" service.") % @service_name)
           elsif !Service.Restart(@wait_service_name)
             Report.Error(_("Cannot restart \"%s\" service.") % @wait_service_name)
           end
         end
       else
+        # Disable and stop services
+        if !Service.Disable(@service_name)
+          Report.Error(Message.CannotAdjustService(@service_name))
+        elsif !Service.Disable(@wait_service_name)
+          Report.Error(Message.CannotAdjustService(@wait_service_name))
+        end
         Service.Stop(@service_name)
         Service.Stop(@wait_service_name)
       end

diff --git a/test/ntp_client_test.rb b/test/ntp_client_test.rb
@@ -291,10 +291,10 @@
 
       it "enables and restarts services" do
         allow(subject).to receive(:check_service).and_call_original
-        expect(Yast::Service).to receive(:Enable).with(subject.service_name).and_return(true)
-        expect(Yast::Service).to receive(:Enable).with(subject.wait_service_name).and_return(true)
-        expect(Yast::Service).to receive(:Restart).with(subject.service_name).and_return(true)
-        expect(Yast::Service).to receive(:Restart).with(subject.wait_service_name).and_return(true)
+        expect(Yast::Service).to receive(:Enable).with("chronyd").and_return(true)
+        expect(Yast::Service).to receive(:Enable).with("chrony-wait").and_return(true)
+        expect(Yast::Service).to receive(:Restart).with("chronyd").and_return(true)
+        expect(Yast::Service).to receive(:Restart).with("chrony-wait").and_return(true)
 
         subject.Write
       end
@@ -307,10 +307,10 @@
 
       it "disables and stops services" do
         allow(subject).to receive(:check_service).and_call_original
-        expect(Yast::Service).to receive(:Disable).with(subject.service_name).and_return(true)
-        expect(Yast::Service).to receive(:Disable).with(subject.wait_service_name).and_return(true)
-        expect(Yast::Service).to receive(:Stop).with(subject.service_name).and_return(true)
-        expect(Yast::Service).to receive(:Stop).with(subject.wait_service_name).and_return(true)
+        expect(Yast::Service).to receive(:Disable).with("chronyd").and_return(true)
+        expect(Yast::Service).to receive(:Disable).with("chrony-wait").and_return(true)
+        expect(Yast::Service).to receive(:Stop).with("chronyd").and_return(true)
+        expect(Yast::Service).to receive(:Stop).with("chrony-wait").and_return(true)
 
         subject.Write
       end