Do not write if only synchronization is requested.

yast · Nov 8, 2018 · e99bab5 · e99bab5
1 parent cbfda15
commit e99bab5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/src/clients/ntp-client_proposal.rb b/src/clients/ntp-client_proposal.rb
@@ -1,13 +1,13 @@
 # encoding: utf-8
 
-# File:	clients/ntp-client_proposal.ycp
-# Summary:	Installation client for ntp configuration
-# Author:	Bubli <kmachalkova@suse.cz>
-#
-# This is used as the general interface between yast2-country
-# (time,timezone) and yast2-ntp-client.
+require "yast"
+
 module Yast
+  # This is used as the general interface between yast2-country
+  # (time,timezone) and yast2-ntp-client.
   class NtpClientProposalClient < Client
+    include Logger
+
     def main
       Yast.import "UI"
       textdomain "ntp-client"
@@ -366,11 +366,11 @@ def Write(params)
 
       return :invalid_hostname unless ValidateSingleServer(ntp_server)
 
-      WriteNtpSettings(ntp_servers, ntp_server, run_service)
+      add_or_install_required_package unless params["write_only"]
 
-      return :success if params["write_only"]
+      WriteNtpSettings(ntp_servers, ntp_server, run_service) unless params["ntpdate_only"]
 
-      add_or_install_required_package
+      return :success if params["write_only"]
 
       # Only if network is running try to synchronize the ntp server
       if NetworkService.isNetworkRunning
@@ -381,9 +381,6 @@ def Write(params)
         return :ntpdate_failed unless exit_code.zero?
       end
 
-      # User wants more than running one time sync (synchronize on boot)
-      WriteNtpSettings(ntp_servers, ntp_server, run_service) unless params["ntpdate_only"]
-
       :success
     end
 

diff --git a/src/modules/NtpClient.rb b/src/modules/NtpClient.rb
@@ -37,6 +37,9 @@ class NtpClientClass < Module
 
     NTP_FILE = "/etc/ntp.conf".freeze
 
+    # Package which is needed for saving NTP configuration into system
+    REQUIRED_PACKAGE = "ntp".freeze
+
     def main
       Yast.import "UI"
       textdomain "ntp-client"

diff --git a/test/ntp_client_proposal_test.rb b/test/ntp_client_proposal_test.rb
@@ -14,7 +14,7 @@
   describe "#Write" do
     let(:ntp_server) { "fake.pool.ntp.org" }
     let(:write_only) { false }
-    let(:ntpdate_only) { true }
+    let(:ntpdate_only) { false }
     let(:params) do
       {
         "server"       => ntp_server,
@@ -148,18 +148,18 @@
       end
 
       context "and user only wants to syncronize date" do
-        it "writes settings only once" do
-          expect(subject).to receive(:WriteNtpSettings).once
+        let(:ntpdate_only) { true }
+
+        it "does not write settings" do
+          expect(subject).to_not receive(:WriteNtpSettings)
 
           subject.Write(params)
         end
       end
 
       context "and user wants to syncronize on boot" do
-        let(:ntpdate_only) { false }
-
-        it "writes settings again?" do
-          expect(subject).to receive(:WriteNtpSettings).twice
+        it "writes settings only once" do
+          expect(subject).to receive(:WriteNtpSettings).once
 
           subject.Write(params)
         end