Merge branch 'master' into next

[i3/i3] / testcases / t / 61-regress-borders-restart.t

diff --git a/testcases/t/61-regress-borders-restart.t b/testcases/t/61-regress-borders-restart.t
index 25a73b5db623845ba4b3a94073ce5b6744c56b0b..c5e3ef8080c2cd2224cee9815d931f0a98e71dab 100644 (file)
--- a/testcases/t/61-regress-borders-restart.t
+++ b/testcases/t/61-regress-borders-restart.t
@@ -10,9 +10,9 @@ use List::Util qw(first);
 use i3test;
 
 my $x = X11::XCB::Connection->new;
-my $i3 = i3("/tmp/nestedcons");
+my $i3 = i3(get_socket_path());
 my $tmp = fresh_workspace;
-my $window = open_standard_window($x);
+my $window = open_window($x);
 
 sub get_border_style {
     my @content = @{get_ws_content($tmp)};