Merge branch 'master' into next

[i3/i3] / testcases / t / 159-socketpaths.t

diff --git a/testcases/t/159-socketpaths.t b/testcases/t/159-socketpaths.t
index b9cc9b631e1549d25f9c8eb31b99f6903ad6ac37..cc54d5a980f7581bf8c2dbbaed39b1e4ecc50e0d 100644 (file)
--- a/testcases/t/159-socketpaths.t
+++ b/testcases/t/159-socketpaths.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 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;
@@ -24,7 +23,7 @@ delete $ENV{XDG_RUNTIME_DIR};
 # See which files exist in /tmp before to not mistakenly check an already
 # existing tmpdir of another i3 instance.
 my @files_before = </tmp/i3-*>;
-my $pid = launch_with_config($config, 1);
+my $pid = launch_with_config($config, dont_add_socket_path => 1);
 my @files_after = </tmp/i3-*>;
 @files_after = grep { !($_ ~~ @files_before) } @files_after;
 
@@ -50,7 +49,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;
@@ -72,7 +71,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");