drop RHBZ #1349721 workaround, as the bug is fixed
ClosedPublic
Actions

Authored by adamwill on Aug 19 2016, 10:44 PM.

Details

Reviewers

garretraziel
jskladan

Commits

Summary

Pretty simple!

Test Plan

Check the upgrade tests work the same as before the
change.

Repository

rOPENQATESTS os-autoinst-distri-fedora

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

adamwill retitled this revision from to drop RHBZ #1349721 workaround, as the bug is fixed.Aug 19 2016, 10:44 PM

adamwill updated this object.

adamwill edited the test plan for this revision. (Show Details)

This revision is now accepted and ready to land.Aug 29 2016, 7:18 AM

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			tests/upgrade_run.pm (15 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	2501	962c350		Aug 19 2016, 10:44 PM	★	★
Diff 2	2517	5d7b46c	rOPENQATESTS67cb387e9adb307c1f9807f8710913bf064714fc	Aug 29 2016, 6:45 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
0f720ad90b35	ab98e1e0f0ff	962c350e9119	Adam Williamson	drop RHBZ #1349721 workaround, as the bug is fixed (Show More…)	Aug 19 2016, 10:43 PM

Show All 13 Lines		5	sub run {
14	upload_logs "/var/log/dnf.rpm.log";	14		upload_logs "/var/log/dnf.rpm.log";
15		15
16	script_run "dnf system-upgrade reboot";	16		script_run "dnf system-upgrade reboot";
17	# fail immediately if we see a DNF error message	17		# fail immediately if we see a DNF error message
18	die "DNF reported failure" if (check_screen "upgrade_fail", 15);	18		die "DNF reported failure" if (check_screen "upgrade_fail", 15);
19	if (get_var("ENCRYPT_PASSWORD")) {	19		if (get_var("ENCRYPT_PASSWORD")) {
20	$self->boot_decrypt(60);	20		$self->boot_decrypt(60);
21	}	21		}
22	# try and catch if we hit RHBZ #1349721 and work around it
23	if (check_screen "bootloader") {
24	# wait some secs for the screen to clear
25	sleep 10;
26	if (get_var("ENCRYPT_PASSWORD")) {
27	$self->boot_decrypt(60);
28	}
29	if (check_screen "bootloader") {
30	record_soft_failure;
31	$self->do_bootloader(postinstall=>1, params=>"enforcing=0");
32	if (get_var("ENCRYPT_PASSWORD")) {
33	$self->boot_decrypt(60);
34	}
35	}
36	}
37	# in encrypted case we need to wait a bit so postinstall test	22		# in encrypted case we need to wait a bit so postinstall test
38	# doesn't bogus match on the encryption prompt we just completed	23		# doesn't bogus match on the encryption prompt we just completed
39	# before it disappears from view	24		# before it disappears from view
40	if (get_var("ENCRYPT_PASSWORD")) {	25		if (get_var("ENCRYPT_PASSWORD")) {
41	sleep 5;	26		sleep 5;
42	}	27		}
43	}	28		}
44		29
Show All 12 Lines