nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Make i3 create its temporary files in /tmp/i3-testsuite 

This behavior can be avoided by passing dont_create_temp_dir => 1 to
launch_with_config (or activate_i3).

This commit fixes t/159-socketpaths.t being flaky on non-systemd computers.
This commit is contained in:
Michael Stapelberg 2012-01-30 15:51:48 +00:00
parent c1e0c38b27
commit efa1cada29
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testcases/lib/SocketActivation.pm
View File

@ -52,6 +52,10 @@ sub activate_i3 {
$ENV{LISTEN_PID} = $$; $ENV{LISTEN_PID} = $$;
$ENV{LISTEN_FDS} = 1; $ENV{LISTEN_FDS} = 1;
delete $ENV{DESKTOP_STARTUP_ID}; delete $ENV{DESKTOP_STARTUP_ID};
unless ($args{dont_create_temp_dir}) {
$ENV{XDG_RUNTIME_DIR} = '/tmp/i3-testsuite/';
mkdir $ENV{XDG_RUNTIME_DIR};
}
$ENV{DISPLAY} = $args{display}; $ENV{DISPLAY} = $args{display};
$ENV{PATH} = join(':', $ENV{PATH} = join(':',
'../i3-nagbar', '../i3-nagbar',

3
testcases/lib/i3test.pm
View File

@ -513,6 +513,8 @@ sub launch_with_config {
$tmp_socket_path = "/tmp/nested-$ENV{DISPLAY}"; $tmp_socket_path = "/tmp/nested-$ENV{DISPLAY}";
$args{dont_create_temp_dir} //= 0;
my ($fh, $tmpfile) = tempfile("i3-cfg-for-$ENV{TESTNAME}-XXXXX", UNLINK => 1); my ($fh, $tmpfile) = tempfile("i3-cfg-for-$ENV{TESTNAME}-XXXXX", UNLINK => 1);
if ($config ne '-default') { if ($config ne '-default') {
@ -540,6 +542,7 @@ sub launch_with_config {
strace => $ENV{STRACE}, strace => $ENV{STRACE},
restart => $ENV{RESTART}, restart => $ENV{RESTART},
cv => $cv, cv => $cv,
dont_create_temp_dir => $args{dont_create_temp_dir},
); );
# force update of the cached socket path in lib/i3test # force update of the cached socket path in lib/i3test

6
testcases/t/159-socketpaths.t
View File

@ -23,7 +23,7 @@ delete $ENV{XDG_RUNTIME_DIR};
# See which files exist in /tmp before to not mistakenly check an already # See which files exist in /tmp before to not mistakenly check an already
# existing tmpdir of another i3 instance. # existing tmpdir of another i3 instance.
my @files_before = </tmp/i3-*>; my @files_before = </tmp/i3-*>;
my $pid = launch_with_config($config, dont_add_socket_path => 1); my $pid = launch_with_config($config, dont_add_socket_path => 1, dont_create_temp_dir => 1);
my @files_after = </tmp/i3-*>; my @files_after = </tmp/i3-*>;
@files_after = grep { !($_ ~~ @files_before) } @files_after; @files_after = grep { !($_ ~~ @files_before) } @files_after;
@ -49,7 +49,7 @@ ok(! -e "$rtdir/i3", "$rtdir/i3 does not exist yet");
$ENV{XDG_RUNTIME_DIR} = $rtdir; $ENV{XDG_RUNTIME_DIR} = $rtdir;
$pid = launch_with_config($config, dont_add_socket_path => 1); $pid = launch_with_config($config, dont_add_socket_path => 1, dont_create_temp_dir => 1);
ok(-d "$rtdir/i3", "$rtdir/i3 exists and is a directory"); ok(-d "$rtdir/i3", "$rtdir/i3 exists and is a directory");
$socketpath = "$rtdir/i3/ipc-socket." . $pid; $socketpath = "$rtdir/i3/ipc-socket." . $pid;
@ -71,7 +71,7 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
ipc-socket $socketpath ipc-socket $socketpath
EOT EOT
$pid = launch_with_config($config, dont_add_socket_path => 1); $pid = launch_with_config($config, dont_add_socket_path => 1, dont_create_temp_dir => 1);
ok(-S $socketpath, "file $socketpath exists and is a socket"); ok(-S $socketpath, "file $socketpath exists and is a socket");