Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2016-08-03 11:42:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2016-07-16 22:12:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2016-08-03 11:42:37.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 18 14:56:27 UTC 2016 - jreidinger@suse.com + +- do not fail tests when run in environment connected by serial + console (bnc#989405) +- 3.1.199 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.198.tar.bz2 New: ---- yast2-bootloader-3.1.199.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.9wtnrO/_old 2016-08-03 11:42:38.000000000 +0200 +++ /var/tmp/diff_new_pack.9wtnrO/_new 2016-08-03 11:42:38.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.198 +Version: 3.1.199 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.198.tar.bz2 -> yast2-bootloader-3.1.199.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.198/package/yast2-bootloader.changes new/yast2-bootloader-3.1.199/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.198/package/yast2-bootloader.changes 2016-07-15 12:18:52.000000000 +0200 +++ new/yast2-bootloader-3.1.199/package/yast2-bootloader.changes 2016-07-18 17:25:07.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jul 18 14:56:27 UTC 2016 - jreidinger@suse.com + +- do not fail tests when run in environment connected by serial + console (bnc#989405) +- 3.1.199 + +------------------------------------------------------------------- Wed Jul 13 08:49:50 UTC 2016 - jreidinger@suse.com - fix writing default boot entry when it is located in grub2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.198/package/yast2-bootloader.spec new/yast2-bootloader-3.1.199/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.198/package/yast2-bootloader.spec 2016-07-15 12:18:52.000000000 +0200 +++ new/yast2-bootloader-3.1.199/package/yast2-bootloader.spec 2016-07-18 17:25:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.198 +Version: 3.1.199 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.198/test/grub2base_test.rb new/yast2-bootloader-3.1.199/test/grub2base_test.rb --- old/yast2-bootloader-3.1.198/test/grub2base_test.rb 2016-07-15 12:18:52.000000000 +0200 +++ new/yast2-bootloader-3.1.199/test/grub2base_test.rb 2016-07-18 17:25:07.000000000 +0200 @@ -120,11 +120,47 @@ allow(Yast::Arch).to receive(:architecture).and_return("s390_64") end - it "proposes console terminal" do + context "with TERM=\"linux\"" do + before do + allow(ENV).to receive(:"[]").with("TERM").and_return("linux") + end + + it "proposes to use serial terminal" do + subject.propose + + expect(subject.grub_default.terminal).to eq :serial + end + end + + context "on other TERM" do + before do + allow(ENV).to receive(:"[]").with("TERM").and_return("xterm") + end + + it "proposes to use console terminal" do + subject.propose + + expect(subject.grub_default.terminal).to eq :console + end + end + end + + context "on ppc" do + before do + allow(Yast::Arch).to receive(:architecture).and_return("ppc64") + end + + it "proposes to use console terminal" do subject.propose expect(subject.grub_default.terminal).to eq :console end + + it "sets GFXPAYLOAD_LINUX to text" do + subject.propose + + expect(subject.grub_default.generic_get("GRUB_GFXPAYLOAD_LINUX")).to eq "text" + end end context "otherwise" do @@ -213,7 +249,7 @@ context "with TERM=\"linux\"" do before do - ENV["TERM"] = "linux" + allow(ENV).to receive(:"[]").with("TERM").and_return("linux") end it "proposes to use serial console with \"TERM=linux console=ttyS0 console=ttyS1\"" do @@ -225,7 +261,7 @@ context "on other TERM" do before do - ENV["TERM"] = "xterm" + allow(ENV).to receive(:"[]").with("TERM").and_return("xterm") end it "proposes dumb term and sets 8 iuvc terminals" do