Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network -> sle12 ## BNC# 886434 : "YaST2 installer takes several minutes in initialisation" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-09-02 15:56:57.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-09-03 13:39:50.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Sep 3 09:01:40 UTC 2014 - mvidner@suse.com + +- Test speed-up. +- 3.1.92 + +------------------------------------------------------------------- +Wed Sep 3 08:37:43 UTC 2014 - mfilka@suse.com + +- bnc#886434 + - accelerated autoconfiguration at the beginning of installer +- 3.1.91 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-network - at least 19 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old) and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:43513 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-network-3.1.90.tar.bz2 New: ---- yast2-network-3.1.92.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.QWndN3/_old 2014-09-03 16:38:33.000000000 +0200 +++ /var/tmp/diff_new_pack.QWndN3/_new 2014-09-03 16:38:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.90 +Version: 3.1.92 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.90.tar.bz2 -> yast2-network-3.1.92.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/package/yast2-network.changes new/yast2-network-3.1.92/package/yast2-network.changes --- old/yast2-network-3.1.90/package/yast2-network.changes 2014-09-02 11:09:24.000000000 +0200 +++ new/yast2-network-3.1.92/package/yast2-network.changes 2014-09-03 13:34:31.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed Sep 3 09:01:40 UTC 2014 - mvidner@suse.com + +- Test speed-up. +- 3.1.92 + +------------------------------------------------------------------- +Wed Sep 3 08:37:43 UTC 2014 - mfilka@suse.com + +- bnc#886434 + - accelerated autoconfiguration at the beginning of installer +- 3.1.91 + +------------------------------------------------------------------- Tue Sep 2 08:45:30 UTC 2014 - ancor@suse.com - Updated BuildRequires to break cycle introduced in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/package/yast2-network.spec new/yast2-network-3.1.92/package/yast2-network.spec --- old/yast2-network-3.1.90/package/yast2-network.spec 2014-09-02 11:09:24.000000000 +0200 +++ new/yast2-network-3.1.92/package/yast2-network.spec 2014-09-03 13:34:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.90 +Version: 3.1.92 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/src/lib/network/network_autoconfiguration.rb new/yast2-network-3.1.92/src/lib/network/network_autoconfiguration.rb --- old/yast2-network-3.1.90/src/lib/network/network_autoconfiguration.rb 2014-09-02 11:09:24.000000000 +0200 +++ new/yast2-network-3.1.92/src/lib/network/network_autoconfiguration.rb 2014-09-03 13:34:32.000000000 +0200 @@ -37,9 +37,6 @@ # TODO time consuming, some progress would be nice dhcp_cards.each { |d| setup_dhcp(d) } - # FIXME this can be really slow as it calls wicked one-by-one. - # So for n devices connected to a network but without dhcp - # it takes n * <dhcp lease wait timeout>. activate_changes(dhcp_cards) # drop devices without dhcp lease @@ -145,8 +142,15 @@ LanItems.Commit end - def reload_config(card) - SCR.Execute(BASH_PATH, "wicked ifreload '#{card}'") == 0 + # Reloads configuration for each device named in devs + # + # @devs [Array] list of device names + # @return true if configuration was reloaded + def reload_config(devs) + raise ArgumentError if devs.nil? + return true if devs.empty? + + SCR.Execute(BASH_PATH, "wicked ifreload #{devs.join(" ")}") == 0 end def delete_config(devname) @@ -157,13 +161,17 @@ NetworkInterfaces.Write("") end + # Writes and activates changes in devices configurations + # + # @devnames [Array] list of device names + # @return true when changes were successfully applied def activate_changes(devnames) return false if !write_configuration # workaround for gh#yast/yast-core#74 (https://github.com/yast/yast-core/issues/74) NetworkInterfaces.CleanCacheRead() - devnames.map { |d| reload_config(d) } + reload_config(devnames) end def configured?(devname) @@ -194,7 +202,11 @@ # Check if given device can reach some of reference servers def set_default_route_flag_if_wan_dev?(devname) set_default_route_flag(devname, "yes") - activate_changes([devname]) + + if !activate_changes([devname]) + log.warn("Cannot reach reference server via #{devname}") + return false + end reached = target_servers.any? do |server| ping_cmd = "ping -I #{devname} -c 3 #{server}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/test/bridge_test.rb new/yast2-network-3.1.92/test/bridge_test.rb --- old/yast2-network-3.1.90/test/bridge_test.rb 2014-09-02 11:09:24.000000000 +0200 +++ new/yast2-network-3.1.92/test/bridge_test.rb 2014-09-03 13:34:32.000000000 +0200 @@ -4,8 +4,6 @@ require "yast" -include Yast - Yast.import "LanItems" module Yast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/test/install_inf_convertor_test.rb new/yast2-network-3.1.92/test/install_inf_convertor_test.rb --- old/yast2-network-3.1.90/test/install_inf_convertor_test.rb 2014-09-02 11:09:25.000000000 +0200 +++ new/yast2-network-3.1.92/test/install_inf_convertor_test.rb 2014-09-03 13:34:32.000000000 +0200 @@ -6,6 +6,8 @@ require "network/install_inf_convertor" include Yast # for path shortcut and avoid namespace +Yast.import "Proxy" + describe "InstallInfConvertor" do context "in case of no network config in /etc/install.inf" do @@ -20,7 +22,7 @@ describe "#write_dhcp_timeout" do it "returns false" do - expect(@install_inf_convertor.send(:write_dhcp_timeout)).to be_false + expect(@install_inf_convertor.send(:write_dhcp_timeout)).to be false end end @@ -32,31 +34,31 @@ describe "#write_hostname" do it "returns false" do - expect(@install_inf_convertor.send(:write_hostname)).to be_false + expect(@install_inf_convertor.send(:write_hostname)).to be false end end describe "#write_dns" do it "returns false" do - expect(@install_inf_convertor.send(:write_dns)).to be_false + expect(@install_inf_convertor.send(:write_dns)).to be false end end describe "#write_proxy" do it "returns false" do - expect(@install_inf_convertor.send(:write_proxy)).to be_false + expect(@install_inf_convertor.send(:write_proxy)).to be false end end describe "#write_nis_domain" do it "returns false" do - expect(@install_inf_convertor.send(:write_nis_domain)).to be_false + expect(@install_inf_convertor.send(:write_nis_domain)).to be false end end describe "#write_connect_wait" do it "returns false" do - expect(@install_inf_convertor.send(:write_connect_wait)).to be_false + expect(@install_inf_convertor.send(:write_connect_wait)).to be false end end @@ -224,7 +226,7 @@ end expect(Yast::Proxy).to receive(:Write).and_return(true) - expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be_true + expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be true end it "writes proxy credentials separately" do @@ -249,7 +251,7 @@ end expect(Yast::Proxy).to receive(:Write).and_return(true) - expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be_true + expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be true end it "does not write proxy configuration if not defined in install.inf" do @@ -259,7 +261,7 @@ expect(Yast::Proxy).to receive(:Read).never expect(Yast::Proxy).to receive(:Write).never - expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be_false + expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be false end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/test/lan_items_helpers_test.rb new/yast2-network-3.1.92/test/lan_items_helpers_test.rb --- old/yast2-network-3.1.90/test/lan_items_helpers_test.rb 2014-09-02 11:09:25.000000000 +0200 +++ new/yast2-network-3.1.92/test/lan_items_helpers_test.rb 2014-09-03 13:34:32.000000000 +0200 @@ -11,32 +11,32 @@ it "succeeds when item has configuration" do Yast::LanItems.stub(:GetLanItem) { { "ifcfg" => "enp0s3" } } - expect(Yast::LanItems.IsItemConfigured(0)).to be_true + expect(Yast::LanItems.IsItemConfigured(0)).to be true end it "fails when item doesn't exist" do Yast::LanItems.stub(:GetLanItem) { {} } - expect(Yast::LanItems.IsItemConfigured(0)).to be_false + expect(Yast::LanItems.IsItemConfigured(0)).to be false end it "fails when item's configuration doesn't exist" do Yast::LanItems.stub(:GetLanItem) { { "ifcfg" => nil } } - expect(Yast::LanItems.IsItemConfigured(0)).to be_false + expect(Yast::LanItems.IsItemConfigured(0)).to be false end end describe "LanItemsClass#delete_dev" do - MOCKED_ITEMS = { + MOCKED_ITEMS_DEL = { 0 => { "ifcfg" => "enp0s3" } } before(:each) do - Yast::LanItems.Items = MOCKED_ITEMS + Yast::LanItems.Items = MOCKED_ITEMS_DEL end it "removes device config when found" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/test/link_handlers_test.rb new/yast2-network-3.1.92/test/link_handlers_test.rb --- old/yast2-network-3.1.90/test/link_handlers_test.rb 2014-09-02 11:09:25.000000000 +0200 +++ new/yast2-network-3.1.92/test/link_handlers_test.rb 2014-09-03 13:34:32.000000000 +0200 @@ -4,20 +4,29 @@ require "yast" -describe "phy_connected?" do - before(:each) do +# need a class to stub the sleep call; hard to stub it on Kernel +class LinkHandlersClass + def initialize Yast.include self, "network/routines.rb" + end +end +describe "phy_connected?" do + include Yast + subject { LinkHandlersClass.new } + + before(:each) do Yast::SCR.stub(:Execute).with(path(".target.bash"), //) { 0 } + allow(subject).to receive(:sleep) end it "returns true if PHY layer is available" do Yast::SCR.stub(:Read).with(path(".target.string"), /\/sys\/class\/net/) { 1 } - expect(phy_connected?("enp0s3")).to eql true + expect(subject.phy_connected?("enp0s3")).to eql true end it "returns false if PHY layer is available" do Yast::SCR.stub(:Read).with(path(".target.string"), /\/sys\/class\/net/) { 0 } - expect(phy_connected?("enp0s3")).to eql false + expect(subject.phy_connected?("enp0s3")).to eql false end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/test/netcard_test.rb new/yast2-network-3.1.92/test/netcard_test.rb --- old/yast2-network-3.1.90/test/netcard_test.rb 2014-09-02 11:09:25.000000000 +0200 +++ new/yast2-network-3.1.92/test/netcard_test.rb 2014-09-03 13:34:32.000000000 +0200 @@ -199,7 +199,7 @@ @lan_items.DeleteItem - expect(@lan_items.FindAndSelect(item_name)).to be_false + expect(@lan_items.FindAndSelect(item_name)).to be false end end @@ -207,11 +207,11 @@ before_size = @lan_items.Items.size item_name = "enp0s3" - expect(@lan_items.FindAndSelect(item_name)).to be_true + expect(@lan_items.FindAndSelect(item_name)).to be true @lan_items.DeleteItem - expect(@lan_items.FindAndSelect(item_name)).to be_false + expect(@lan_items.FindAndSelect(item_name)).to be false expect(@lan_items.Items.size).to eql before_size end end @@ -244,10 +244,10 @@ end it "finds configured device" do - expect(@lan_items.FindAndSelect("enp0s3")).to be_true + expect(@lan_items.FindAndSelect("enp0s3")).to be true end it "fails to find unconfigured device" do - expect(@lan_items.FindAndSelect("nonexistent")).to be_false + expect(@lan_items.FindAndSelect("nonexistent")).to be false end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/test/network_autoconfiguration_test.rb new/yast2-network-3.1.92/test/network_autoconfiguration_test.rb --- old/yast2-network-3.1.90/test/network_autoconfiguration_test.rb 2014-09-02 11:09:25.000000000 +0200 +++ new/yast2-network-3.1.92/test/network_autoconfiguration_test.rb 2014-09-03 13:34:32.000000000 +0200 @@ -161,11 +161,11 @@ expect(Yast::SCR). to receive(:Read). with(Yast::Path.new(".udev_persistent.net")). - and_return {} + and_return({}) expect(Yast::SCR). to receive(:Read). with(Yast::Path.new(".udev_persistent.drivers")). - and_return {} + and_return({}) end it "configures just one NIC to have a default route" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/test/new_device_startmode_test.rb new/yast2-network-3.1.92/test/new_device_startmode_test.rb --- old/yast2-network-3.1.90/test/new_device_startmode_test.rb 2014-09-02 11:09:25.000000000 +0200 +++ new/yast2-network-3.1.92/test/new_device_startmode_test.rb 2014-09-03 13:34:32.000000000 +0200 @@ -13,6 +13,13 @@ "STARTMODE" => "invalid" } + AVAILABLE_PRODUCT_STARTMODES = [ + "hotplug", + "manual", + "off", + "nfsroot" + ] + ["hotplug", ""].each do |hwinfo_hotplug| expected_startmode = hwinfo_hotplug == "hotplug" ? "hotplug" : "auto" @@ -79,13 +86,6 @@ context "When product_startmode is not auto neither ifplugd" do - AVAILABLE_PRODUCT_STARTMODES = [ - "hotplug", - "manual", - "off", - "nfsroot" - ] - AVAILABLE_PRODUCT_STARTMODES.each do |product_startmode| it "for #{product_startmode} it results to #{expected_startmode} if device " + hotplug_desc do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/test/routing_test.rb new/yast2-network-3.1.92/test/routing_test.rb --- old/yast2-network-3.1.90/test/routing_test.rb 2014-09-02 11:09:25.000000000 +0200 +++ new/yast2-network-3.1.92/test/routing_test.rb 2014-09-03 13:34:32.000000000 +0200 @@ -178,11 +178,11 @@ describe "#Import" do it "Returns true for non nil settings" do - expect(Routing.Import({})).to be_true + expect(Routing.Import({})).to be true end it "Returns true for nil settings" do - expect(Routing.Import(nil)).to be_true + expect(Routing.Import(nil)).to be true end end @@ -298,7 +298,7 @@ it "loads configuration from system" do NetworkInterfaces.as_null_object - expect(Routing.Read).to be_true + expect(Routing.Read).to be true end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/test/suse_firewall_4_network_test.rb new/yast2-network-3.1.92/test/suse_firewall_4_network_test.rb --- old/yast2-network-3.1.90/test/suse_firewall_4_network_test.rb 2014-09-02 11:09:25.000000000 +0200 +++ new/yast2-network-3.1.92/test/suse_firewall_4_network_test.rb 2014-09-03 13:34:32.000000000 +0200 @@ -27,14 +27,14 @@ describe "#SetSshdEnabled" do it "sets whether sshd service should be started and caches the information in ServicesProposal" do SuSEFirewall4Network.SetSshdEnabled(true) - expect(SuSEFirewall4Network.EnabledSshd).to be_true - expect(ServicesProposal.enabled_services.include?('sshd')).to be_true - expect(ServicesProposal.disabled_services.include?('sshd')).to be_false + expect(SuSEFirewall4Network.EnabledSshd).to be true + expect(ServicesProposal.enabled_services.include?('sshd')).to be true + expect(ServicesProposal.disabled_services.include?('sshd')).to be false SuSEFirewall4Network.SetSshdEnabled(false) - expect(SuSEFirewall4Network.EnabledSshd).to be_false - expect(ServicesProposal.enabled_services.include?('sshd')).to be_false - expect(ServicesProposal.disabled_services.include?('sshd')).to be_true + expect(SuSEFirewall4Network.EnabledSshd).to be false + expect(ServicesProposal.enabled_services.include?('sshd')).to be false + expect(ServicesProposal.disabled_services.include?('sshd')).to be true end end @@ -46,8 +46,8 @@ it "proposes firewall and ssh port according to control file" do SuSEFirewall4Network.prepare_proposal - expect(SuSEFirewall4Network.Enabled1stStage).to be_true - expect(SuSEFirewall4Network.EnabledSsh1stStage).to be_false + expect(SuSEFirewall4Network.Enabled1stStage).to be true + expect(SuSEFirewall4Network.EnabledSsh1stStage).to be false end end @@ -58,8 +58,8 @@ it "proposes disabled firewall and proposes ssh port according to control file" do SuSEFirewall4Network.prepare_proposal - expect(SuSEFirewall4Network.Enabled1stStage).to be_false - expect(SuSEFirewall4Network.EnabledSsh1stStage).to be_false + expect(SuSEFirewall4Network.Enabled1stStage).to be false + expect(SuSEFirewall4Network.EnabledSsh1stStage).to be false end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.90/test/test_helper.rb new/yast2-network-3.1.92/test/test_helper.rb --- old/yast2-network-3.1.90/test/test_helper.rb 2014-09-02 11:09:25.000000000 +0200 +++ new/yast2-network-3.1.92/test/test_helper.rb 2014-09-03 13:34:32.000000000 +0200 @@ -1 +1,3 @@ -ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) +srcdir = File.expand_path("../../src", __FILE__) +y2dirs = ENV.fetch("Y2DIR", "").split(":") +ENV["Y2DIR"] = y2dirs.unshift(srcdir).join(":") continue with "q"... Checked in at Wed Sep 3 16:38:53 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org