Changes based on CR.

yast · Nov 12, 2018 · 2f806be · 2f806be
1 parent 428f1f0
commit 2f806be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb
@@ -1024,7 +1024,7 @@ def dhcp_ntp_servers
       return [] if !NetworkService.isNetworkRunning || Yast::NetworkService.is_network_manager
 
       ReadWithCacheNoGUI()
-      Yast::LanItems.dhcp_ntp_servers.values.reduce(&:concat) || []
+      Yast::LanItems.dhcp_ntp_servers.values.flatten.uniq
     end
 
     publish variable: :ipv6, type: "boolean"

diff --git a/test/lan_test.rb b/test/lan_test.rb
@@ -452,13 +452,14 @@ def expect_modification_succeedes(modname, method)
   let(:servers) do
     {
       "eth0" => ["0.pool.ntp.org", "1.pool.ntp.org"],
-      "eth1" => ["2.pool.ntp.org"]
+      "eth1" => ["1.pool.ntp.org", "2.pool.ntp.org"]
     }
   end
 
   before do
     allow(Yast::NetworkService).to receive(:isNetworkRunning).and_return(running)
     allow(Yast::NetworkService).to receive(:is_network_manager).and_return(nm_enabled)
+    allow(Yast::LanItems).to receive(:dhcp_ntp_servers).and_return(servers)
   end
 
   context "when the network is not running" do
@@ -484,8 +485,7 @@ def expect_modification_succeedes(modname, method)
     end
 
     it "returns a list of the ntp_servers provided by dhcp " do
-      expect(Yast::LanItems).to receive(:dhcp_ntp_servers).and_return(servers)
-      expect(subject.dhcp_ntp_servers)
+      expect(subject.dhcp_ntp_servers.sort)
         .to eql(["0.pool.ntp.org", "1.pool.ntp.org", "2.pool.ntp.org"])
     end
   end