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

testcases: use global $x in wait_for_event, drop $x parameter

This commit is contained in:
Maik Fischer 2011-11-21 23:37:04 +01:00 committed by Michael Stapelberg
parent 30ea33decb
commit db6de84d0b
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
testcases/lib/i3test.pm
View File

@ -90,7 +90,7 @@ __
# wait_for_event $x, 0.25, sub { $_[0]->{response_type} == MAP_NOTIFY }; # wait_for_event $x, 0.25, sub { $_[0]->{response_type} == MAP_NOTIFY };
# #
sub wait_for_event { sub wait_for_event {
my ($x, $timeout, $cb) = @_; my ($timeout, $cb) = @_;
my $cv = AE::cv; my $cv = AE::cv;
@ -122,16 +122,14 @@ sub wait_for_event {
# thin wrapper around wait_for_event which waits for MAP_NOTIFY # thin wrapper around wait_for_event which waits for MAP_NOTIFY
# make sure to include 'structure_notify' in the window’s event_mask attribute # make sure to include 'structure_notify' in the window’s event_mask attribute
sub wait_for_map { sub wait_for_map {
my ($x) = @_; wait_for_event 2, sub { $_[0]->{response_type} == MAP_NOTIFY };
wait_for_event $x, 2, sub { $_[0]->{response_type} == MAP_NOTIFY };
} }
# Wrapper around wait_for_event which waits for UNMAP_NOTIFY. Also calls # Wrapper around wait_for_event which waits for UNMAP_NOTIFY. Also calls
# sync_with_i3 to make sure i3 also picked up and processed the UnmapNotify # sync_with_i3 to make sure i3 also picked up and processed the UnmapNotify
# event. # event.
sub wait_for_unmap { sub wait_for_unmap {
my ($x) = @_; wait_for_event 2, sub { $_[0]->{response_type} == UNMAP_NOTIFY };
wait_for_event $x, 2, sub { $_[0]->{response_type} == UNMAP_NOTIFY };
sync_with_i3($x); sync_with_i3($x);
} }
@ -334,7 +332,7 @@ sub sync_with_i3 {
$_sync_window->map; $_sync_window->map;
wait_for_event $x, 2, sub { $_[0]->{response_type} == MAP_NOTIFY }; wait_for_event 2, sub { $_[0]->{response_type} == MAP_NOTIFY };
} }
my $root = $x->get_root_window(); my $root = $x->get_root_window();
@ -360,7 +358,7 @@ sub sync_with_i3 {
$x->send_event(0, $root, EVENT_MASK_SUBSTRUCTURE_REDIRECT, $msg); $x->send_event(0, $root, EVENT_MASK_SUBSTRUCTURE_REDIRECT, $msg);
# now wait until the reply is here # now wait until the reply is here
return wait_for_event $x, 2, sub { return wait_for_event 2, sub {
my ($event) = @_; my ($event) = @_;
# TODO: const # TODO: const
return 0 unless $event->{response_type} == 161; return 0 unless $event->{response_type} == 161;

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

@ -10,7 +10,7 @@ subtest 'Window without WM_TAKE_FOCUS', sub {
my $window = open_window($x); my $window = open_window($x);
ok(!wait_for_event($x, 1, sub { $_[0]->{response_type} == 161 }), 'did not receive ClientMessage'); ok(!wait_for_event(1, sub { $_[0]->{response_type} == 161 }), 'did not receive ClientMessage');
done_testing; done_testing;
}; };
@ -27,7 +27,7 @@ subtest 'Window with WM_TAKE_FOCUS', sub {
$window->map; $window->map;
ok(wait_for_event($x, 1, sub { ok(wait_for_event(1, sub {
return 0 unless $_[0]->{response_type} == 161; return 0 unless $_[0]->{response_type} == 161;
my ($data, $time) = unpack("L2", $_[0]->{data}); my ($data, $time) = unpack("L2", $_[0]->{data});
return ($data == $take_focus->id); return ($data == $take_focus->id);