testcases: use the does_i3_live function

This commit is contained in:
Michael Stapelberg 2011-01-28 01:21:38 +01:00
parent 773bc5ba6d
commit dc6241456a
5 changed files with 11 additions and 26 deletions

View File

@ -7,19 +7,14 @@
use i3test tests => 1; use i3test tests => 1;
use X11::XCB qw(:all); use X11::XCB qw(:all);
my $i3 = i3("/tmp/nestedcons");
my $tmp = get_unused_workspace(); my $tmp = get_unused_workspace();
$i3->command("workspace $tmp")->recv; cmd "workspace $tmp";
$i3->command('open')->recv; cmd 'open';
$i3->command('mode toggle')->recv; cmd 'mode toggle';
$i3->command('kill')->recv; cmd 'kill';
$i3->command('kill')->recv; cmd 'kill';
does_i3_live;
my $tree = $i3->get_tree->recv;
my @nodes = @{$tree->{nodes}};
ok(@nodes > 0, 'i3 still lives');
diag( "Testing i3, Perl $], $^X" ); diag( "Testing i3, Perl $], $^X" );

View File

@ -40,8 +40,6 @@ is(get_focused($tmp), $floating, 'floating window focused');
sleep 1; sleep 1;
$i3->command('mode toggle')->recv; $i3->command('mode toggle')->recv;
my $tree = $i3->get_tree->recv; does_i3_live;
my @nodes = @{$tree->{nodes}};
ok(@nodes > 0, 'i3 still lives');
diag( "Testing i3, Perl $], $^X" ); diag( "Testing i3, Perl $], $^X" );

View File

@ -5,12 +5,8 @@
# #
use i3test tests => 1; use i3test tests => 1;
my $i3 = i3("/tmp/nestedcons"); cmd 'blargh!';
$i3->command("blargh!")->recv; does_i3_live;
my $tree = $i3->get_tree->recv;
my @nodes = @{$tree->{nodes}};
ok(@nodes > 0, 'i3 still lives');
diag( "Testing i3, Perl $], $^X" ); diag( "Testing i3, Perl $], $^X" );

View File

@ -14,6 +14,4 @@ cmd 'open';
cmd 'mode toggle'; cmd 'mode toggle';
cmd "move workspace $otmp"; cmd "move workspace $otmp";
my $tree = i3('/tmp/nestedcons')->get_tree->recv; does_i3_live;
my @nodes = @{$tree->{nodes}};
ok(@nodes > 0, 'i3 still lives');

View File

@ -34,6 +34,4 @@ sleep 0.25;
cmd 'move before v'; cmd 'move before v';
sleep 0.25; sleep 0.25;
my $tree = i3('/tmp/nestedcons')->get_tree->recv; does_i3_live;
my @nodes = @{$tree->{nodes}};
ok(@nodes > 0, 'i3 still lives');