From 2f1216c3b0a0ddf2d2bc52d0e49bfeed248e90ac Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 16 Oct 2015 23:38:09 -0700 Subject: [PATCH] use lowercase $VERSION for upgrade version check Summary: For Rawhide, the text in os-release-fedora is 'rawhide' not 'Rawhide', so lc the $VERSION value when checking. For other releases it's digits, so the lc won't change anything - lc('23') is '23'. Test Plan: Run the Rawhide upgrade tests, they should succeed. Reviewers: jskladan, garretraziel Reviewed By: garretraziel Subscribers: tflink Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D620 --- tests/upgrade_postinstall_desktop.pm | 2 +- tests/upgrade_postinstall_minimal.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/upgrade_postinstall_desktop.pm b/tests/upgrade_postinstall_desktop.pm index 0cf6d737..50804527 100644 --- a/tests/upgrade_postinstall_desktop.pm +++ b/tests/upgrade_postinstall_desktop.pm @@ -19,7 +19,7 @@ sub run { assert_screen "graphical_desktop_clean", 30; # check an upgrade actually happened (and we can log into a console) $self->root_console(tty=>3); - $self->check_release(get_var('VERSION')); + $self->check_release(lc(get_var('VERSION'))); } diff --git a/tests/upgrade_postinstall_minimal.pm b/tests/upgrade_postinstall_minimal.pm index 9f59761e..fec3f415 100644 --- a/tests/upgrade_postinstall_minimal.pm +++ b/tests/upgrade_postinstall_minimal.pm @@ -9,7 +9,7 @@ sub run { # try to login, check whether target release is installed $self->boot_to_login_screen(); $self->root_console(tty=>3); - $self->check_release(get_var('VERSION')); + $self->check_release(lc(get_var('VERSION'))); }