testcases: always start i3 through i3test::launch_with_config
this will pave the way to just call BAIL_OUT and stop the currently running testfile if i3 died for whatever reason.
This commit is contained in:
@ -1,10 +1,9 @@
|
||||
#!perl
|
||||
# vim:ts=4:sw=4:expandtab
|
||||
# !NO_I3_INSTANCE! will prevent complete-run.pl from starting i3
|
||||
#
|
||||
# Tests if the various ipc_socket_path options are correctly handled
|
||||
#
|
||||
use i3test;
|
||||
use i3test i3_autostart => 0;
|
||||
use File::Temp qw(tempfile tempdir);
|
||||
use POSIX qw(getuid);
|
||||
use v5.10;
|
||||
@ -20,7 +19,7 @@ EOT
|
||||
|
||||
# ensure XDG_RUNTIME_DIR is not set
|
||||
delete $ENV{XDG_RUNTIME_DIR};
|
||||
my $pid = launch_with_config($config, 1);
|
||||
my $pid = launch_with_config($config, dont_add_socket_path => 1);
|
||||
|
||||
my $folder = "/tmp/i3-" . getpwuid(getuid());
|
||||
ok(-d $folder, "folder $folder exists");
|
||||
@ -39,7 +38,7 @@ ok(! -e "$rtdir/i3", "$rtdir/i3 does not exist yet");
|
||||
|
||||
$ENV{XDG_RUNTIME_DIR} = $rtdir;
|
||||
|
||||
$pid = launch_with_config($config, 1);
|
||||
$pid = launch_with_config($config, dont_add_socket_path => 1);
|
||||
|
||||
ok(-d "$rtdir/i3", "$rtdir/i3 exists and is a directory");
|
||||
$socketpath = "$rtdir/i3/ipc-socket." . $pid;
|
||||
@ -61,7 +60,7 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||
ipc-socket $socketpath
|
||||
EOT
|
||||
|
||||
$pid = launch_with_config($config, 1);
|
||||
$pid = launch_with_config($config, dont_add_socket_path => 1);
|
||||
|
||||
ok(-S $socketpath, "file $socketpath exists and is a socket");
|
||||
|
||||
|
Reference in New Issue
Block a user