Merge branch 'master' into next

[i3/i3] / testcases / t / 166-assign.t

diff --git a/testcases/t/166-assign.t b/testcases/t/166-assign.t
index 254616c5bc26130340c63930aec4e869004dff8a..3a8a10d5fe166baf27714ab7b55047debd7c3a57 100644 (file)
--- a/testcases/t/166-assign.t
+++ b/testcases/t/166-assign.t
@@ -1,10 +1,9 @@
 #!perl
 # vim:ts=4:sw=4:expandtab
-# !NO_I3_INSTANCE! will prevent complete-run.pl from starting i3
 #
 # Tests if assignments work
 #
-use i3test;
+use i3test i3_autostart => 0;
 use X11::XCB qw(PROP_MODE_REPLACE);
 
 # TODO: move to X11::XCB
@@ -31,10 +30,15 @@ sub open_special {
     my $wm_class = delete($args{wm_class}) || 'special';
     $args{name} //= 'special window';
 
-    return open_window(
+    # We use dont_map because i3 will not map the window on the current
+    # workspace. Thus, open_window would time out in wait_for_map (2 seconds).
+    my $window = open_window(
         %args,
         before_map => sub { set_wm_class($_->id, $wm_class, $wm_class) },
+        dont_map => 1,
     );
+    $window->map;
+    return $window;
 }
 
 #####################################################################
@@ -53,6 +57,7 @@ my $tmp = fresh_workspace;
 ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
 
 my $window = open_special;
+wait_for_map($window);
 
 ok(@{get_ws_content($tmp)} == 1, 'special window got managed to current (random) workspace');
 
@@ -88,8 +93,6 @@ $window->destroy;
 
 exit_gracefully($pid);
 
-sleep 0.25;
-
 #####################################################################
 # start a window and see that it gets assigned to a workspace which has content
 # already, next to the existing node.
@@ -150,8 +153,6 @@ $window->destroy;
 
 exit_gracefully($pid);
 
-sleep 0.25;
-
 #####################################################################
 # make sure that assignments are case-insensitive in the old syntax.
 #####################################################################
@@ -171,6 +172,7 @@ $workspaces = get_workspace_names;
 ok(!("targetws" ~~ @{$workspaces}), 'targetws does not exist yet');
 
 $window = open_special(wm_class => 'SPEcial');
+wait_for_map $window;
 
 $content = get_ws($tmp);
 ok(@{$content->{nodes}} == 0, 'no tiling cons');
@@ -180,33 +182,41 @@ $window->destroy;
 
 exit_gracefully($pid);
 
-sleep 0.25;
-
 #####################################################################
 # regression test: dock clients with floating assignments should not crash
 # (instead, nothing should happen - dock clients can’t float)
 # ticket #501
 #####################################################################
 
+# Walks /proc to figure out whether a child process of $i3pid with the name
+# 'i3-nagbar' exists.
+sub i3nagbar_running {
+    my ($i3pid) = @_;
+
+    my @procfiles = grep { m,^/proc/[0-9]+$, } </proc/*>;
+    for my $path (@procfiles) {
+        open(my $fh, '<', "$path/stat") or next;
+        my $line = <$fh>;
+        close($fh);
+        my ($comm, $ppid) = ($line =~ /^[0-9]+ \(([^)]+)\) . ([0-9]+)/);
+        return 1 if $ppid == $i3pid && $comm eq 'i3-nagbar';
+    }
+    return 0;
+}
+
 $config = <<EOT;
 # i3 config file (v4)
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-assign "special" → ~
+for_window [title="special"] floating enable
 EOT
 
 $pid = launch_with_config($config);
 
-# TODO: replace this with checking the process hierarchy
-# XXX: give i3-nagbar some time to start up
-sleep 1;
-
 $tmp = fresh_workspace;
 
 ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
 my @docked = get_dock_clients;
-# We expect i3-nagbar as the first dock client due to using the old assign
-# syntax
-is(@docked, 1, 'one dock client yet');
+is(@docked, 0, 'one dock client yet');
 
 $window = open_special(
     window_type => $x->atom(name => '_NET_WM_WINDOW_TYPE_DOCK'),
@@ -216,7 +226,7 @@ $content = get_ws($tmp);
 ok(@{$content->{nodes}} == 0, 'no tiling cons');
 ok(@{$content->{floating_nodes}} == 0, 'one floating con');
 @docked = get_dock_clients;
-is(@docked, 2, 'two dock clients now');
+is(@docked, 1, 'one dock client now');
 
 $window->destroy;