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