Merge branch 'master' into next

[i3/i3] / testcases / t / 63-wm-state.t

diff --git a/testcases/t/63-wm-state.t b/testcases/t/63-wm-state.t
index b91614007567ece6da6f381a073eaffd241dda7b..e55d86824de934d97cab3fb0b21f5773618c3e0d 100644 (file)
--- a/testcases/t/63-wm-state.t
+++ b/testcases/t/63-wm-state.t
@@ -7,27 +7,17 @@
 use X11::XCB qw(:all);
 use i3test;
 
-BEGIN {
-    use_ok('X11::XCB::Window');
-    use_ok('X11::XCB::Event::Generic');
-    use_ok('X11::XCB::Event::MapNotify');
-    use_ok('X11::XCB::Event::ClientMessage');
-}
-
 my $x = X11::XCB::Connection->new;
 
-my $window = open_standard_window($x);
+my $window = open_window($x);
 
 sync_with_i3($x);
 
-diag('window mapped');
-
 is($window->state, ICCCM_WM_STATE_NORMAL, 'WM_STATE normal');
 
 $window->unmap;
 
-# TODO: wait for unmapnotify
-sync_with_i3($x);
+wait_for_unmap $x;
 
 is($window->state, ICCCM_WM_STATE_WITHDRAWN, 'WM_STATE withdrawn');