Differential D1033

drop check_type_string, use upstream merged code instead
ClosedPublic
Actions

Authored by adamwill on Oct 18 2016, 7:23 PM.

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQATESTS7869c3d07a44: drop check_type_string, use upstream merged code instead
Summary

The code from check_type_string was effectively merged into
os-autoinst's testapi::type_string as an optional argument,
so let's drop this downstream version and just have the 'safe
typing' functions use type_string.

Test Plan

Run tests, check they pass and work the same (i.e.
make sure they're actually checking for screen change when
typing).

Diff Detail

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 check_type_string, use upstream merged code instead.Oct 18 2016, 7:23 PM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: garretraziel, jskladan.
garretraziel accepted this revision.Oct 20 2016, 1:03 PM

Seems to work.

This revision is now accepted and ready to land.Oct 20 2016, 1:03 PM
Closed by commit rOPENQATESTS7869c3d07a44: drop check_type_string, use upstream merged code instead (authored by adamwill). · Explain WhyOct 20 2016, 4:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mlib/main_common.pm (24 lines)

Diff 2644

View Options

lib/main_common.pm

1package main_common; 1​package main_common;
2 2​
3use strict; 3​use strict;
4 4​
5use base 'Exporter'; 5​use base 'Exporter';
6use Exporter; 6​use Exporter;
7 7​
8use testapi; 8​use testapi;
9our @EXPORT = qw/run_with_error_check check_type_string type_safely type_very_safely desktop_vt boot_to_login_screen console_login console_switch_layout/; 9​our @EXPORT = qw/run_with_error_check type_safely type_very_safely desktop_vt boot_to_login_screen console_login console_switch_layout/;
10 10​
11sub run_with_error_check { 11​sub run_with_error_check {
12 my ($func, $error_screen) = @_; 12​ my ($func, $error_screen) = @_;
13 die "Error screen appeared" if (check_screen $error_screen, 5); 13​ die "Error screen appeared" if (check_screen $error_screen, 5);
14 $func->(); 14​ $func->();
15 die "Error screen appeared" if (check_screen $error_screen, 5); 15​ die "Error screen appeared" if (check_screen $error_screen, 5);
16} 16​}
17 17​
18# type the string in sets of characters at a time (default 3), waiting ​
19# for a screen change after each set. Intended to be safer when the VM ​
20# is busy and regular type_string may overload the input buffer. Args ​
21# passed along to `type_string`. Accepts additional args: ​
22# `size` - size of character groups (default 3) - set to 1 for extreme ​
23# safety (but slower and more screenshotting) ​
24sub check_type_string { ​
25 my ($string, %args) = @_; ​
26 $args{size} //= 3; ​
27 ​
28 # split string into an array of pieces of specified size ​
29 # https://stackoverflow.com/questions/372370 ​
30 my @pieces = unpack("(a$args{size})*", $string); ​
31 for my $piece (@pieces) { ​
32 wait_screen_change { type_string($piece, %args); }; ​
33 } ​
34} ​
35 ​
36# high-level 'type this string quite safely but reasonably fast' 18​# high-level 'type this string quite safely but reasonably fast'
37# function whose specific implementation may vary 19​# function whose specific implementation may vary
38sub type_safely { 20​sub type_safely {
39 my $string = shift; 21​ my $string = shift;
40 check_type_string($string, max_interval => 20); 22​ type_string($string, wait_screen_change => 3, max_interval => 20);
41 wait_still_screen 2; 23​ wait_still_screen 2;
42} 24​}
43 25​
44# high-level 'type this string extremely safely and rather slow' 26​# high-level 'type this string extremely safely and rather slow'
45# function whose specific implementation may vary 27​# function whose specific implementation may vary
46sub type_very_safely { 28​sub type_very_safely {
47 my $string = shift; 29​ my $string = shift;
48 check_type_string($string, size => 1, still => 5, max_interval => 1); 30​ type_string($string, wait_screen_change => 1, max_interval => 1);
49 wait_still_screen 5; 31​ wait_still_screen 5;
50} 32​}
51 33​
52# Figure out what tty the desktop is on, switch to it. Assumes we're 34​# Figure out what tty the desktop is on, switch to it. Assumes we're
53# at a root console 35​# at a root console
54sub desktop_vt { 36​sub desktop_vt {
55 # use ps to find the tty of Xwayland or Xorg 37​ # use ps to find the tty of Xwayland or Xorg
56 my $xout; 38​ my $xout;
▲ Show 20 Lines • Show All 97 Lines • Show Last 20 Lines