|
 |
cca0c4 |
From 5ec8c855f307a89f08013c832bd7e121c8f83327 Mon Sep 17 00:00:00 2001
|
|
|
cca0c4 |
From: Robert Marshall <rmarshall@redhat.com>
|
|
|
cca0c4 |
Date: Thu, 15 Dec 2016 21:47:28 -0500
|
|
|
cca0c4 |
Subject: [PATCH 33/55] Fix some test cases where the resulting default index
|
|
|
cca0c4 |
is wrong
|
|
|
cca0c4 |
|
|
|
cca0c4 |
Fix two issues with tests where removing a kernel or adding a boot entry
|
|
|
cca0c4 |
at a user specified index had the wrong default index selected in the
|
|
|
cca0c4 |
expected output.
|
|
|
cca0c4 |
|
|
|
cca0c4 |
One of these issues is the --set-index test cases for grub 1, which
|
|
|
cca0c4 |
expect --make-default is implied where it should not be.
|
|
|
cca0c4 |
|
|
|
cca0c4 |
The third is a removal test, where the default index in the result data
|
|
|
cca0c4 |
is off by one when we've removed 2 entries keyed off of the kernel
|
|
|
cca0c4 |
filesystem path.
|
|
|
cca0c4 |
|
|
|
cca0c4 |
This change causes these test cases to fail.
|
|
|
cca0c4 |
|
|
|
cca0c4 |
Resolves: rhbz#1285601
|
|
|
cca0c4 |
---
|
|
|
cca0c4 |
test/results/add/g1.17 | 2 +-
|
|
|
cca0c4 |
test/results/add/g1.9 | 2 +-
|
|
|
cca0c4 |
test/results/remove/g7.1 | 2 +-
|
|
|
cca0c4 |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
cca0c4 |
|
|
|
cca0c4 |
diff --git a/test/results/add/g1.17 b/test/results/add/g1.17
|
|
|
cca0c4 |
index 6a388228768..eda4e93329d 100644
|
|
|
cca0c4 |
--- a/test/results/add/g1.17
|
|
|
cca0c4 |
+++ b/test/results/add/g1.17
|
|
|
cca0c4 |
@@ -7,7 +7,7 @@
|
|
|
cca0c4 |
# kernel /vmlinuz-version ro root=/dev/sda1
|
|
|
cca0c4 |
# initrd /initrd-version.img
|
|
|
cca0c4 |
#boot=/dev/hda
|
|
|
cca0c4 |
-default=1
|
|
|
cca0c4 |
+default=0
|
|
|
cca0c4 |
timeout=10
|
|
|
cca0c4 |
splashimage=(hd0,0)/grub/splash.xpm.gz
|
|
|
cca0c4 |
title Red Hat Linux (2.4.7-2)
|
|
|
cca0c4 |
diff --git a/test/results/add/g1.9 b/test/results/add/g1.9
|
|
|
cca0c4 |
index 310623d13d2..8976e762d74 100644
|
|
|
cca0c4 |
--- a/test/results/add/g1.9
|
|
|
cca0c4 |
+++ b/test/results/add/g1.9
|
|
|
cca0c4 |
@@ -7,7 +7,7 @@
|
|
|
cca0c4 |
# kernel /vmlinuz-version ro root=/dev/sda1
|
|
|
cca0c4 |
# initrd /initrd-version.img
|
|
|
cca0c4 |
#boot=/dev/hda
|
|
|
cca0c4 |
-default=2
|
|
|
cca0c4 |
+default=1
|
|
|
cca0c4 |
timeout=10
|
|
|
cca0c4 |
splashimage=(hd0,0)/grub/splash.xpm.gz
|
|
|
cca0c4 |
title Red Hat Linux (2.4.7-2)
|
|
|
cca0c4 |
diff --git a/test/results/remove/g7.1 b/test/results/remove/g7.1
|
|
|
cca0c4 |
index ea1a6fbaec9..611d7a16685 100644
|
|
|
cca0c4 |
--- a/test/results/remove/g7.1
|
|
|
cca0c4 |
+++ b/test/results/remove/g7.1
|
|
|
cca0c4 |
@@ -1,4 +1,4 @@
|
|
|
cca0c4 |
-default=1
|
|
|
cca0c4 |
+default=0
|
|
|
cca0c4 |
timeout=10
|
|
|
cca0c4 |
splashimage=(hd0,5)/boot/grub/splash.xpm.gz
|
|
|
cca0c4 |
|
|
|
cca0c4 |
--
|
|
|
cca0c4 |
2.17.1
|
|
|
cca0c4 |
|