Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2015-05-19 23:23:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2015-05-16 20:07:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2015-05-19 23:23:24.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 18 10:32:24 CEST 2015 - [email protected] + +- Making SuSEFirewallProposal.propose_iscsi function public + (bsc#916376) +- 3.1.123 + +------------------------------------------------------------------- Old: ---- yast2-3.1.122.tar.bz2 New: ---- yast2-3.1.123.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.dle3JW/_old 2015-05-19 23:23:25.000000000 +0200 +++ /var/tmp/diff_new_pack.dle3JW/_new 2015-05-19 23:23:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.122 +Version: 3.1.123 Release: 0 Url: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.122.tar.bz2 -> yast2-3.1.123.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.122/library/network/src/modules/SuSEFirewallProposal.rb new/yast2-3.1.123/library/network/src/modules/SuSEFirewallProposal.rb --- old/yast2-3.1.122/library/network/src/modules/SuSEFirewallProposal.rb 2015-05-15 18:11:07.000000000 +0200 +++ new/yast2-3.1.123/library/network/src/modules/SuSEFirewallProposal.rb 2015-05-18 17:02:13.000000000 +0200 @@ -771,8 +771,6 @@ { "output" => output, "warning" => warning } end - private - # Proposes firewall settings for iSCSI def propose_iscsi log.info "iSCSI has been used during installation, opening #{@iscsi_target_service} service" @@ -781,6 +779,8 @@ # bsc#916376: ports need to be open already during boot SuSEFirewall.full_init_on_boot(true) + + nil end publish function: :OpenServiceOnNonDialUpInterfaces, type: "void (string, list <string>)" @@ -791,6 +791,7 @@ publish function: :Reset, type: "void ()" publish function: :Propose, type: "void ()" publish function: :ProposalSummary, type: "map <string, string> ()" + publish function: :propose_iscsi, type: "void ()" end SuSEFirewallProposal = SuSEFirewallProposalClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.122/library/network/test/susefirewall_proposal_test.rb new/yast2-3.1.123/library/network/test/susefirewall_proposal_test.rb --- old/yast2-3.1.122/library/network/test/susefirewall_proposal_test.rb 2015-05-15 18:11:07.000000000 +0200 +++ new/yast2-3.1.123/library/network/test/susefirewall_proposal_test.rb 2015-05-18 17:02:13.000000000 +0200 @@ -9,6 +9,26 @@ describe Yast::SuSEFirewallProposal do describe "#ProposeFunctions" do + context "when iscsi is used" do + it "calls the iscsi proposal" do + allow(Yast::Linuxrc).to receive(:useiscsi).and_return(true) + expect(Yast::SuSEFirewallProposal).to receive(:propose_iscsi).and_return(nil) + + Yast::SuSEFirewallProposal.ProposeFunctions + end + end + + context "when iscsi is not used" do + it "does not call the iscsi proposal" do + allow(Yast::Linuxrc).to receive(:useiscsi).and_return(false) + expect(Yast::SuSEFirewallProposal).not_to receive(:propose_iscsi) + + Yast::SuSEFirewallProposal.ProposeFunctions + end + end + end + + describe "#propose_iscsi" do before(:each) do allow(Yast::SuSEFirewall).to receive(:GetAllNonDialUpInterfaces).and_return(["eth44", "eth55"]) allow(Yast::SuSEFirewall).to receive(:GetZonesOfInterfaces).and_return(["EXT"]) @@ -16,15 +36,11 @@ allow(Yast::SuSEFirewallProposal).to receive(:ServiceEnabled).and_return(true) end - context "when iscsi is used" do - it "proposes opening iscsi-target firewall service and full firewall initialization on boot" do - allow(Yast::Linuxrc).to receive(:useiscsi).and_return("initial") - - expect(Yast::SuSEFirewall).to receive(:full_init_on_boot).and_return(true) - expect(Yast::SuSEFirewall).to receive(:SetServicesForZones).with(["service:iscsitarget"], ["EXT"], true).and_return(true) + it "proposes opening iscsi-target firewall service and full firewall initialization on boot" do + expect(Yast::SuSEFirewall).to receive(:full_init_on_boot).and_return(true) + expect(Yast::SuSEFirewall).to receive(:SetServicesForZones).with(["service:iscsitarget"], ["EXT"], true).and_return(true) - Yast::SuSEFirewallProposal.ProposeFunctions - end + Yast::SuSEFirewallProposal.propose_iscsi end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.122/package/yast2.changes new/yast2-3.1.123/package/yast2.changes --- old/yast2-3.1.122/package/yast2.changes 2015-05-15 18:11:07.000000000 +0200 +++ new/yast2-3.1.123/package/yast2.changes 2015-05-18 17:02:13.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 18 10:32:24 CEST 2015 - [email protected] + +- Making SuSEFirewallProposal.propose_iscsi function public + (bsc#916376) +- 3.1.123 + +------------------------------------------------------------------- Wed May 13 15:03:50 CEST 2015 - [email protected] - Propose SuSEfirewal2 to fully initialize (e.g. open ports) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.122/package/yast2.spec new/yast2-3.1.123/package/yast2.spec --- old/yast2-3.1.122/package/yast2.spec 2015-05-15 18:11:07.000000000 +0200 +++ new/yast2-3.1.123/package/yast2.spec 2015-05-18 17:02:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.122 +Version: 3.1.123 Release: 0 URL: https://github.com/yast/yast-yast2
