make in-place restarts use socket activation, too (for faster/less flaky tests)

This commit is contained in:
Michael Stapelberg
2012-01-21 23:03:09 +00:00
parent 3b7f4d428e
commit 318d4fdeef
10 changed files with 37 additions and 16 deletions

View File

@ -498,6 +498,9 @@ sub get_socket_path {
my $cookie = $x->get_property(0, $x->get_root_window(), $atom->id, GET_PROPERTY_TYPE_ANY, 0, 256);
my $reply = $x->get_property_reply($cookie->{sequence});
my $socketpath = $reply->{value};
if ($socketpath eq "/tmp/nested-$ENV{DISPLAY}") {
$socketpath .= '-activation';
}
$_cached_socket_path = $socketpath;
return $socketpath;
}

View File

@ -15,7 +15,6 @@ is(scalar @{$ws->{nodes}}, 0, 'no tiling nodes');
is(scalar @{$ws->{floating_nodes}}, 1, 'precisely one floating node');
cmd 'restart';
sleep 0.5;
diag('Checking if i3 still lives');

View File

@ -38,8 +38,6 @@ is($docknode->{rect}->{height}, 30, 'dock node has unchanged height');
# perform an inplace-restart
cmd 'restart';
sleep 0.25;
does_i3_live;
@ -78,7 +76,6 @@ $docknode = $docked[0];
is($docknode->{rect}->{height}, 20, 'dock node has unchanged height');
cmd 'restart';
sleep 0.25;
@docked = get_dock_clients;
is(@docked, 1, 'one dock client found');

View File

@ -28,8 +28,6 @@ is(get_border_style(), '1pixel', 'border style 1pixel after changing');
# perform an inplace-restart
cmd 'restart';
sleep 0.25;
does_i3_live;
is(get_border_style(), '1pixel', 'border style still 1pixel after restart');

View File

@ -17,7 +17,6 @@ cmd 'fullscreen';
sync_with_i3;
cmd 'restart';
sleep 1;
does_i3_live;

View File

@ -278,7 +278,6 @@ my $old_nodes = scalar @{$__i3_scratch->{nodes}};
my $old_floating_nodes = scalar @{$__i3_scratch->{floating_nodes}};
cmd 'restart';
sleep 1;
does_i3_live;

View File

@ -20,7 +20,6 @@ is($focus->[0], $nodes->[0]->{id}, 'first node focused');
is($focus->[1], $nodes->[1]->{id}, 'second node second in focus stack');
cmd 'restart';
sleep 1;
does_i3_live;