Merge branch 'release-4.16.1'

[i3/i3] / testcases / t / 512-move-wraps.t

diff --git a/testcases/t/512-move-wraps.t b/testcases/t/512-move-wraps.t
index d3952e4e6bd975089a8344134edfe106394bf450..d346a17623d02bd2b8ae52d0ce25bfd035d56c3c 100644 (file)
--- a/testcases/t/512-move-wraps.t
+++ b/testcases/t/512-move-wraps.t
@@ -2,13 +2,13 @@
 # vim:ts=4:sw=4:expandtab
 #
 # Please read the following documents before working on tests:
-# • http://build.i3wm.org/docs/testsuite.html
+# • https://build.i3wm.org/docs/testsuite.html
 #   (or docs/testsuite)
 #
-# • http://build.i3wm.org/docs/lib-i3test.html
+# • https://build.i3wm.org/docs/lib-i3test.html
 #   (alternatively: perldoc ./testcases/lib/i3test.pm)
 #
-# • http://build.i3wm.org/docs/ipc.html
+# • https://build.i3wm.org/docs/ipc.html
 #   (or docs/ipc)
 #
 # • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
@@ -18,21 +18,13 @@
 # E.g. when you have a container on the right output and you move it to the
 # right, it should appear on the left output.
 # Bug still in: 4.4-106-g3cd4b8c
-use i3test i3_autostart => 0;
-
-# Ensure the pointer is at (0, 0) so that we really start on the first
-# (the left) workspace.
-$x->root->warp_pointer(0, 0);
-
-my $config = <<EOT;
+use i3test i3_config => <<EOT;
 # i3 config file (v4)
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 
 fake-outputs 1024x768+0+0,1024x768+1024+0
 EOT
 
-my $pid = launch_with_config($config);
-
 my $right = fresh_workspace(output => 1);
 my $left = fresh_workspace(output => 0);
 
@@ -41,6 +33,7 @@ my $win = open_window;
 is_num_children($left, 1, 'one container on left workspace');
 
 cmd 'move container to output right';
+cmd 'focus output right';
 
 is_num_children($left, 0, 'no containers on left workspace');
 is_num_children($right, 1, 'one container on right workspace');
@@ -50,6 +43,4 @@ cmd 'move container to output right';
 is_num_children($left, 1, 'one container on left workspace');
 is_num_children($right, 0, 'no containers on right workspace');
 
-exit_gracefully($pid);
-
 done_testing;