Hello community,

here is the log from the commit of package yast2-bootloader for 
openSUSE:Factory checked in at 2020-06-21 19:04:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-bootloader.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-bootloader"

Sun Jun 21 19:04:06 2020 rev:292 rq:815696 version:4.3.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes        
2020-06-11 14:44:21.389322111 +0200
+++ 
/work/SRC/openSUSE:Factory/.yast2-bootloader.new.3606/yast2-bootloader.changes  
    2020-06-21 19:10:10.849242764 +0200
@@ -1,0 +2,8 @@
+Thu Jun 18 08:37:58 UTC 2020 - José Iván López González <[email protected]>
+
+- Avoid random failure in unit tests when there is a serial
+  console.
+- Related to bsc#1172390.
+- 4.3.6
+
+-------------------------------------------------------------------

Old:
----
  yast2-bootloader-4.3.5.tar.bz2

New:
----
  yast2-bootloader-4.3.6.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.HnsoY5/_old  2020-06-21 19:10:11.405243871 +0200
+++ /var/tmp/diff_new_pack.HnsoY5/_new  2020-06-21 19:10:11.405243871 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        4.3.5
+Version:        4.3.6
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later

++++++ yast2-bootloader-4.3.5.tar.bz2 -> yast2-bootloader-4.3.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-bootloader-4.3.5/package/yast2-bootloader.changes 
new/yast2-bootloader-4.3.6/package/yast2-bootloader.changes
--- old/yast2-bootloader-4.3.5/package/yast2-bootloader.changes 2020-06-10 
15:55:29.000000000 +0200
+++ new/yast2-bootloader-4.3.6/package/yast2-bootloader.changes 2020-06-18 
10:51:45.000000000 +0200
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Thu Jun 18 08:37:58 UTC 2020 - José Iván López González <[email protected]>
+
+- Avoid random failure in unit tests when there is a serial
+  console.
+- Related to bsc#1172390.
+- 4.3.6
+
+-------------------------------------------------------------------
 Wed Jun 10 13:51:24 UTC 2020 - Imobach Gonzalez Sosa <[email protected]>
 
 - AutoYaST: import AutoInstall only when needed (related to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-bootloader-4.3.5/package/yast2-bootloader.spec 
new/yast2-bootloader-4.3.6/package/yast2-bootloader.spec
--- old/yast2-bootloader-4.3.5/package/yast2-bootloader.spec    2020-06-10 
15:55:29.000000000 +0200
+++ new/yast2-bootloader-4.3.6/package/yast2-bootloader.spec    2020-06-18 
10:51:45.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        4.3.5
+Version:        4.3.6
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-bootloader-4.3.5/test/grub2base_test.rb 
new/yast2-bootloader-4.3.6/test/grub2base_test.rb
--- old/yast2-bootloader-4.3.5/test/grub2base_test.rb   2020-06-10 
15:55:29.000000000 +0200
+++ new/yast2-bootloader-4.3.6/test/grub2base_test.rb   2020-06-18 
10:51:45.000000000 +0200
@@ -340,20 +340,46 @@
     end
 
     context "xen hypervisor kernel parameters proposal" do
-      it "do nothing if there is no framebuffer" do
-        allow(Dir).to receive(:[]).and_return([])
+      before do
+        allow(Yast::Kernel).to receive(:GetCmdLine).and_return(kernel_params)
+      end
+
+      context "with a serial console" do
+        let(:kernel_params) { "console=ttyS2,4800n8" }
 
-        subject.propose
+        it "does nothing" do
+          subject.propose
 
-        expect(subject.grub_default.xen_hypervisor_params.parameter("vga")).to 
eq false
+          
expect(subject.grub_default.xen_hypervisor_params.parameter("vga")).to eq false
+        end
       end
 
-      it "propose vga parameter if there is framebuffer" do
-        allow(Dir).to receive(:[]).and_return(["/dev/fb0"])
+      context "without a serial console" do
+        let(:kernel_params) { "" }
+
+        before do
+          allow(Dir).to receive(:[]).and_return(framebuffer)
+        end
+
+        context "when there is no framebuffer" do
+          let(:framebuffer) { [] }
+
+          it "does nothing" do
+            subject.propose
+
+            
expect(subject.grub_default.xen_hypervisor_params.parameter("vga")).to eq false
+          end
+        end
+
+        context "when there is a framebuffer" do
+          let(:framebuffer) { ["/dev/fb0"] }
 
-        subject.propose
+          it "proposes vga parameter" do
+            subject.propose
 
-        expect(subject.grub_default.xen_hypervisor_params.parameter("vga")).to 
eq "gfx-1024x768x16"
+            
expect(subject.grub_default.xen_hypervisor_params.parameter("vga")).to eq 
"gfx-1024x768x16"
+          end
+        end
       end
     end
 


Reply via email to