nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix t/158-wm_take_focus, it was not properly verifying events (Thanks TonyC) 

See also http://cr.i3wm.org/patch/500 for TonyC’s patch. This version
reduces code duplication.
This commit is contained in:
Michael Stapelberg 2014-04-09 21:47:32 +02:00
parent 2dfabc38f8
commit e84fa22bb8
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testcases/lib/i3test.pm
View File

@ -714,6 +714,8 @@ sub sync_with_i3 {
# event mask, it will get the ClientMessage.
$x->send_event(0, $root, EVENT_MASK_SUBSTRUCTURE_REDIRECT, $msg);
return $myrnd if $args{dont_wait_for_event};
# now wait until the reply is here
return wait_for_event 2, sub {
my ($event) = @_;

27
testcases/t/158-wm_take_focus.t
View File

@ -22,10 +22,29 @@ subtest 'Window without WM_TAKE_FOCUS', sub {
fresh_workspace;
my $window = open_window;
# sync_with_i3 will send a ClientMessage to i3 and receive one targeted to
# $window->id. If it receives WM_TAKE_FOCUS instead, it will return 0, thus
# the test will fail.
ok(sync_with_i3(window_id => $window->id), 'did not receive ClientMessage');
# sync_with_i3 will send a ClientMessage to i3 and i3 will send the same
# payload back to $window->id.
my $myrnd = sync_with_i3(
window_id => $window->id,
dont_wait_for_event => 1,
);
# We check whether the first received message has the correct payload — if
# not, the received message was a WM_TAKE_FOCUS message.
my $first_event_is_clientmessage;
wait_for_event 2, sub {
my ($event) = @_;
# TODO: const
return 0 unless $event->{response_type} == 161;
my ($win, $rnd) = unpack "LL", $event->{data};
if (!defined($first_event_is_clientmessage)) {
$first_event_is_clientmessage = ($rnd == $myrnd);
}
return ($rnd == $myrnd);
};
ok($first_event_is_clientmessage, 'did not receive ClientMessage');
done_testing;
};