			Path	Packages
M			lib/fedoralog.pm (19 lines)
M			tests/upgrade_postinstall_minimal.pm (18 lines)
M			tests/upgrade_preinstall_minimal.pm (21 lines)
M			tests/upgrade_run_minimal.pm (10 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	1158	2f20e8e		Jul 14 2015, 11:34 AM	★	★
Diff 2	1166	2f20e8e	Commit rOPENQATESTS4abc1aecf2fae88810602d8e721ca1734b6a6427	Jul 15 2015, 5:00 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
ee26112d5f85	5b8c55464594	2f20e8e10311	Garret Raziel	move logging in as a root into parent class (Show More…)	Jul 14 2015, 11:05 AM

Diff 1166

View Options

lib/fedoralog.pm

1	package fedoralog;	1		package fedoralog;
2	use base 'basetest';	2		use base 'basetest';
3		3
4	use testapi;	4		use testapi;
5		5
6	sub post_fail_hook() {	6		sub login_as_root {
7	my $self = shift;	7		my $self = shift;
		8		my $tty = shift \|\| 1;
			jskladanUnsubmitted Not Done Would it be possible to provide some default value? Or at least check whether the `$tty` is set, and only call `send_key "ctrl-alt-f$tty";` then?
8	my $password = get_var("ROOT_PASSWORD", "weakpassword");	9		my $password = get_var("ROOT_PASSWORD", "weakpassword");
9		10
10	send_key "ctrl-alt-f2";	11		send_key "ctrl-alt-f$tty";
11	assert_screen "text_console_login", 20;	12		assert_screen "text_console_login", 20;
		13
12	type_string "root";	14		type_string "root";
13	send_key "ret";	15		send_key "ret";
14	assert_screen "console_password_required", 10;	16		assert_screen "console_password_required", 10;
15	type_string $password;	17		type_string $password;
16	send_key "ret";	18		send_key "ret";
17		19
18	assert_screen "root_logged_in", 10;	20		assert_screen "root_logged_in", 10;
		21		}
		22
		23		sub boot_and_login {
		24		my $self = shift;
		25		wait_still_screen 10;
		26
		27		$self->login_as_root(3);
		28		}
		29
		30		sub post_fail_hook {
		31		my $self = shift;
		32
		33		$self->login_as_root(2);
19		34
20	# Upload all ABRT logs	35		# Upload all ABRT logs
21	type_string "cd /var/tmp/abrt && tar czvf abrt.tar.gz *";	36		type_string "cd /var/tmp/abrt && tar czvf abrt.tar.gz *";
22	send_key "ret";	37		send_key "ret";
23	upload_logs "/var/tmp/abrt/abrt.tar.gz";	38		upload_logs "/var/tmp/abrt/abrt.tar.gz";
24		39
25	# Upload /var/log	40		# Upload /var/log
26	type_string "tar czvf /tmp/var_log.tar.gz /var/log";	41		type_string "tar czvf /tmp/var_log.tar.gz /var/log";
27	send_key "ret";	42		send_key "ret";
28	upload_logs "/tmp/var_log.tar.gz";	43		upload_logs "/tmp/var_log.tar.gz";
29	}	44		}
30		45
31	1;	46		1;
32		47
33	# vim: set sw=4 et:	48		# vim: set sw=4 et:

View Options

tests/upgrade_postinstall_minimal.pm

1	use base "fedoralog";	1	use base "fedoralog";
2	use strict;	2	use strict;
3	use testapi;	3	use testapi;
4		4
5	sub boot_and_login {
6	wait_still_screen 10;
7
8	my $password = get_var("ROOT_PASSWORD", "weakpassword");
9
10	send_key "ctrl-alt-f3";
11	assert_screen "text_console_login", 20;
12	type_string "root";
13	send_key "ret";
14	assert_screen "console_password_required", 10;
15	type_string $password;
16	send_key "ret";
17	assert_screen "root_logged_in", 10;
18	}
19		5
20	sub run {	6	sub run {
21	boot_and_login();	7	my $self = shift;
		8
		9	$self->boot_and_login();
22		10
23	assert_screen "console_f22_installed";	11	assert_screen "console_f22_installed";
24	}	12	}
25		13
26		14
27	sub test_flags {	15	sub test_flags {
28	# without anything - rollback to 'lastgood' snapshot if failed	16	# without anything - rollback to 'lastgood' snapshot if failed
29	# 'fatal' - whole test suite is in danger if this fails	17	# 'fatal' - whole test suite is in danger if this fails
30	# 'milestone' - after this test succeeds, update 'lastgood'	18	# 'milestone' - after this test succeeds, update 'lastgood'
31	# 'important' - if this fails, set the overall state to 'fail'	19	# 'important' - if this fails, set the overall state to 'fail'
32	return { fatal => 1 };	20	return { fatal => 1 };
33	}	21	}
34		22
35	1;	23	1;
36		24
37	# vim: set sw=4 et:	25	# vim: set sw=4 et:

View Options

tests/upgrade_preinstall_minimal.pm

1	use base "fedoralog";	1	use base "fedoralog";
2	use strict;	2	use strict;
3	use testapi;	3	use testapi;
4		4
5	sub boot_and_login {
6	wait_still_screen 10;
7
8	my $password = get_var("ROOT_PASSWORD", "weakpassword");
9
10	send_key "ctrl-alt-f3";
11	assert_screen "text_console_login", 20;
12	type_string "root";
13	send_key "ret";
14	assert_screen "console_password_required", 10;
15	type_string $password;
16	send_key "ret";
17	assert_screen "root_logged_in", 10;
18	}
19
20	sub run {	5	sub run {
21	boot_and_login();	6	my $self = shift;
		7
		8	$self->boot_and_login();
22		9
23	type_string 'yum -y update; echo $?';	10	type_string 'yum -y update; echo $?';
24	send_key "ret";	11	send_key "ret";
25		12
26	assert_screen "console_command_success", 1800;	13	assert_screen "console_command_success", 1800;
27		14
28	type_string "reboot";	15	type_string "reboot";
29	send_key "ret";	16	send_key "ret";
30		17
31	boot_and_login();	18	$self->boot_and_login();
32		19
33	type_string 'yum -y install fedup; echo $?';	20	type_string 'yum -y install fedup; echo $?';
34	send_key "ret";	21	send_key "ret";
35		22
36	assert_screen "console_command_success", 1800;	23	assert_screen "console_command_success", 1800;
37	}	24	}
38		25
39		26
Show All 11 Lines

View Options

tests/upgrade_run_minimal.pm

Show All 22 Lines		5	sub run {
23	upload_logs "/var/log/fedup.log";	23		upload_logs "/var/log/fedup.log";
24		24
25	type_string "reboot";	25		type_string "reboot";
26	send_key "ret";	26		send_key "ret";
27		27
28	assert_screen "grub_fedup", 30;	28		assert_screen "grub_fedup", 30;
29	send_key "ret";	29		send_key "ret";
30		30
31	my $counter = 0;	31		assert_screen "text_console_login", 6000;
32
33	while (!check_screen ("text_console_login", 10) && $counter < 180) {
34	if (check_screen "tmp_failed_proc", 1) {
35	send_key "ctrl-alt-delete";
36	}
37	$counter++;
38	}
39	assert_screen "text_console_login", 10;
40	}	32		}
41		33
42		34
43	sub test_flags {	35		sub test_flags {
44	# without anything - rollback to 'lastgood' snapshot if failed	36		# without anything - rollback to 'lastgood' snapshot if failed
45	# 'fatal' - whole test suite is in danger if this fails	37		# 'fatal' - whole test suite is in danger if this fails
46	# 'milestone' - after this test succeeds, update 'lastgood'	38		# 'milestone' - after this test succeeds, update 'lastgood'
47	# 'important' - if this fails, set the overall state to 'fail'	39		# 'important' - if this fails, set the overall state to 'fail'
48	return { fatal => 1 };	40		return { fatal => 1 };
49	}	41		}
50		42
51	1;	43		1;
52		44
53	# vim: set sw=4 et:	45		# vim: set sw=4 et:

move logging in as a root into parent classClosedPublicActions

Details

Diff Detail

Revision Contents

Diff 1166

lib/fedoralog.pm

tests/upgrade_postinstall_minimal.pm

tests/upgrade_preinstall_minimal.pm

tests/upgrade_run_minimal.pm

move logging in as a root into parent class
ClosedPublic
Actions