koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i3test::XTEST: don’t “use i3test” to avoid clobbering state

Browse Source 
Before this commit, the $i3_autostart variable was accidentally overridden.
This commit is contained in:
Michael Stapelberg
2017-09-14 11:44:49 +02:00
parent 5d9db61dda
commit 28bfeadbb0
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
testcases/lib/i3test.pm.in
View File

@ -793,14 +793,7 @@ sub get_socket_path {
if ($cache && defined($_cached_socket_path)) {
return $_cached_socket_path;
}
my $atom = $x->atom(name => 'I3_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';
}
my $socketpath = i3test::Util::get_socket_path($x);
$_cached_socket_path = $socketpath;
return $socketpath;
}