[master 1/2] Enable and improve the check for swap LV size in LVM cache kickstart tests

vpodzime installerbot-noreply at redhat.com
Tue Sep 1 13:11:49 UTC 2015


From: Vratislav Podzimek <vpodzime at redhat.com>

The swap LV should now actually have the requested size.
---
 tests/kickstart_tests/lvm-cache-2.ks | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/kickstart_tests/lvm-cache-2.ks b/tests/kickstart_tests/lvm-cache-2.ks
index 9bab78b..3d7290a 100644
--- a/tests/kickstart_tests/lvm-cache-2.ks
+++ b/tests/kickstart_tests/lvm-cache-2.ks
@@ -64,11 +64,10 @@ if [ -z "$swap_lv_entry" -a -z "$swap_uuid_entry" ] ; then
 fi
 
 # verify size of swap lv
-# FIXME: this is not true now!
-# swap_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/swap)
-# if [ "$swap_lv_size" != "500.00" ]; then
-#     echo "*** swap lv has incorrect size" >> /root/RESULT
-# fi
+swap_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/swap | sed -r 's/\s*([0-9]+)\..*/\1/')
+if [ "$swap_lv_size" != "500" ]; then
+    echo "*** swap lv has incorrect size" >> /root/RESULT
+fi
 
 # we don't need to check sizes of grown LVs, the fact that the installation
 # reached this point means everything fit into the VG somehow


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/b958a4d6ff68da9b3b01c12074abe95e63fa8a11


More information about the anaconda-patches mailing list