commit yast2-installation for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2015-03-30 19:09:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2015-02-22 17:25:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2015-03-30 19:09:52.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Mar 27 13:14:22 UTC 2015 - jreidinger@suse.com + +- allow proposal runner dialog to use different proposal store +- 3.1.135 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.134.tar.bz2 New: ---- yast2-installation-3.1.135.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.JU7nQ8/_old 2015-03-30 19:09:53.000000000 +0200 +++ /var/tmp/diff_new_pack.JU7nQ8/_new 2015-03-30 19:09:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.134 +Version: 3.1.135 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.134.tar.bz2 -> yast2-installation-3.1.135.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.134/package/yast2-installation.changes new/yast2-installation-3.1.135/package/yast2-installation.changes --- old/yast2-installation-3.1.134/package/yast2-installation.changes 2015-02-19 12:14:12.000000000 +0100 +++ new/yast2-installation-3.1.135/package/yast2-installation.changes 2015-03-27 15:14:16.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 27 13:14:22 UTC 2015 - jreidinger@suse.com + +- allow proposal runner dialog to use different proposal store +- 3.1.135 + +------------------------------------------------------------------- Tue Feb 17 14:24:19 CET 2015 - aschnell@suse.de - get list of mounts from /proc/mounts in umount_finish (for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.134/package/yast2-installation.spec new/yast2-installation-3.1.135/package/yast2-installation.spec --- old/yast2-installation-3.1.134/package/yast2-installation.spec 2015-02-19 12:14:12.000000000 +0100 +++ new/yast2-installation-3.1.135/package/yast2-installation.spec 2015-03-27 15:14:16.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.134 +Version: 3.1.135 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.134/src/lib/installation/proposal_runner.rb new/yast2-installation-3.1.135/src/lib/installation/proposal_runner.rb --- old/yast2-installation-3.1.134/src/lib/installation/proposal_runner.rb 2015-02-19 12:14:12.000000000 +0100 +++ new/yast2-installation-3.1.135/src/lib/installation/proposal_runner.rb 2015-03-27 15:14:16.000000000 +0100 @@ -38,7 +38,7 @@ new.run end - def initialize + def initialize(store = ::Installation::ProposalStore) Yast.import "Pkg" Yast.import "UI" textdomain "installation" @@ -63,6 +63,7 @@ # BNC #463567 @submods_already_called = [] + @store_class = store end def run @@ -78,7 +79,7 @@ return :auto end - @store = ProposalStore.new(@proposal_mode) + @store = @store_class.new(@proposal_mode) build_dialog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.134/test/Makefile.am new/yast2-installation-3.1.135/test/Makefile.am --- old/yast2-installation-3.1.134/test/Makefile.am 2015-02-19 12:14:12.000000000 +0100 +++ new/yast2-installation-3.1.135/test/Makefile.am 2015-03-27 15:14:16.000000000 +0100 @@ -1,5 +1,7 @@ TESTS = \ inst_functions_test.rb \ + installation_misc_test.rb \ + image_installation_test.rb \ cio_ignore_test.rb \ copy_logs_finish_test.rb \ prep_shrink_test.rb \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.134/test/image_installation_test.rb new/yast2-installation-3.1.135/test/image_installation_test.rb --- old/yast2-installation-3.1.134/test/image_installation_test.rb 2015-02-19 12:14:12.000000000 +0100 +++ new/yast2-installation-3.1.135/test/image_installation_test.rb 2015-03-27 15:14:16.000000000 +0100 @@ -26,12 +26,12 @@ describe Yast::ImageInstallation do describe "#FindImageSet" do before(:each) do - Yast::Pkg.stub(:SourceProvideDigestedFile).and_return(IMAGES_DESCR_FILE) + allow(Yast::Pkg).to receive(:SourceProvideDigestedFile).and_return(IMAGES_DESCR_FILE) end it "finds images matching architecture and selected patterns and returns if processing was successful" do ARCHS.each do |arch| - Yast::Arch.stub(:arch_short).and_return(arch) + allow(Yast::Arch).to receive(:arch_short).and_return(arch) [KDE4_PATTERNS, GNOME_PATTERNS, X11_PATTERNS, BASE_PATTERNS].each do |patterns| Yast::ImageInstallation.FreeInternalVariables() @@ -44,7 +44,7 @@ it "does not find any image using unsupported architecture and returns if processing was successful" do [KDE4_PATTERNS, GNOME_PATTERNS, X11_PATTERNS, BASE_PATTERNS].each do |patterns| - Yast::Arch.stub(:arch_short).and_return(NON_MATCHING_ARCH) + allow(Yast::Arch).to receive(:arch_short).and_return(NON_MATCHING_ARCH) Yast::ImageInstallation.FreeInternalVariables() expect(Yast::ImageInstallation.FindImageSet(patterns)).to eq(true) @@ -55,7 +55,7 @@ it "does not find any image using unsupported patterns and returns if processing was successful" do ARCHS.each do |arch| - Yast::Arch.stub(:arch_short).and_return(arch) + allow(Yast::Arch).to receive(:arch_short).and_return(arch) [NON_MATCHING_PATTERNS_2, NON_MATCHING_PATTERNS_2].each do |patterns| Yast::ImageInstallation.FreeInternalVariables() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.134/test/inst_functions_test.rb new/yast2-installation-3.1.135/test/inst_functions_test.rb --- old/yast2-installation-3.1.134/test/inst_functions_test.rb 2015-02-19 12:14:12.000000000 +0100 +++ new/yast2-installation-3.1.135/test/inst_functions_test.rb 2015-03-27 15:14:16.000000000 +0100 @@ -8,10 +8,10 @@ Yast.import "Linuxrc" def stub_install_inf(install_inf) - Yast::Linuxrc.stub(:keys).and_return(install_inf.keys) + allow(Yast::Linuxrc).to receive(:keys).and_return(install_inf.keys) install_inf.keys.each do |key| - Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key]) + allow(Yast::Linuxrc).to receive(:InstallInf).with(key).and_return(install_inf[key]) end end @@ -23,14 +23,14 @@ it "returns empty list if no features were ignored on commandline" do linuxrc_commandline = "othercommand=xyz no_ignore_features=1 something-else=555" - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.ignored_features.sort).to be_empty end it "returns empty list if features ignored on commandline were empty" do linuxrc_commandline = "ignore_features=" - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.ignored_features.sort).to be_empty end @@ -38,7 +38,7 @@ linuxrc_commandline = "ignore_features=aa,b_b,c-c ignoredfeatures=a-a,dd othercommand=xyz" ignored_features = ["aa", "bb", "cc", "dd"].sort - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features end @@ -46,7 +46,7 @@ linuxrc_commandline = "ignore_features=x-x,yy" ignored_features = ["xx", "yy"].sort - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features end @@ -54,7 +54,7 @@ linuxrc_commandline = "trash=install ignore_feature=f.e.a.ture1 ig.n.o.red_features=feature2 ignore_features=feature3" ignored_features = ["feature1", "feature2", "feature3"].sort - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features end @@ -62,7 +62,7 @@ linuxrc_commandline = "i-g-n-o-r-e_feature=fff" ignored_features = ["fff"] - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features end @@ -70,7 +70,7 @@ linuxrc_commandline = "Ignore_FeaTUres=ffF" ignored_features = ["fff"] - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features end @@ -111,42 +111,42 @@ it "should be true if feature is exactly set on commandline" do linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.feature_ignored?("feature2")).to eq(true) end it "should be true if feature is exactly on commandline using up/down case" do linuxrc_commandline = "trash=install ignore_features=fEAture1 igno-RED_features=f-eatuRE_2 ignore_features=feature3" - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.feature_ignored?("f-e-a-t-u-r-e-2")).to eq(true) end it "should be true if feature is set on commandline with dashes and underscores" do linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.feature_ignored?("f-e-a-t-u-r-e_2")).to eq(true) end it "should be false if feature is not set on commandline" do linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.feature_ignored?("no-such-feature")).to eq(false) end it "should be false if feature to check is empty" do linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.feature_ignored?("")).to eq(false) end it "should be false if feature to check is undefined" do linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + allow(Yast::Linuxrc).to receive(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.feature_ignored?(nil)).to eq(false) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.134/test/installation_misc_test.rb new/yast2-installation-3.1.135/test/installation_misc_test.rb --- old/yast2-installation-3.1.134/test/installation_misc_test.rb 2015-02-19 12:14:12.000000000 +0100 +++ new/yast2-installation-3.1.135/test/installation_misc_test.rb 2015-03-27 15:14:16.000000000 +0100 @@ -8,10 +8,15 @@ include Yast::InstallationMiscInclude end +# fake AutoinstConfig to avoid dependency on autoyast +module Yast + class AutoinstConfig + end +end + # we need to mock these modules Yast.import "Stage" Yast.import "Mode" -Yast.import "AutoinstConfig" Yast.import "ProductControl" def stub_initialstage(bool) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.134/test/proposal_runner_test.rb new/yast2-installation-3.1.135/test/proposal_runner_test.rb --- old/yast2-installation-3.1.134/test/proposal_runner_test.rb 2015-02-19 12:14:12.000000000 +0100 +++ new/yast2-installation-3.1.135/test/proposal_runner_test.rb 2015-03-27 15:14:16.000000000 +0100 @@ -11,6 +11,13 @@ stub_const("Yast::AutoinstConfig", autoinst_config) end + describe ".new" do + it "Allows passing different store implementation" do + class C < ::Installation::ProposalStore; end + expect { ::Installation::ProposalRunner.new(C) }.to_not raise_error + end + end + describe "#run" do it "do nothing if run non-interactive" do Yast.import "Mode" @@ -28,7 +35,7 @@ expect(subject.run).to eq :auto end - it "passes a moske test" do + it "passes a smoke test" do expect { subject.run }.to_not raise_error end end
participants (1)
-
root@hilbert.suse.de