Merge branch 'next' into master

[i3/i3] / testcases / t / 505-scratchpad-resolution.t

diff --git a/testcases/t/505-scratchpad-resolution.t b/testcases/t/505-scratchpad-resolution.t
index ce85cfc0c5b0de3d2a27b57a83601e748fb73052..e72b4dfb9fd85df6700a59634a00b5002c7322a7 100644 (file)
--- a/testcases/t/505-scratchpad-resolution.t
+++ b/testcases/t/505-scratchpad-resolution.t
@@ -1,21 +1,30 @@
 #!perl
 # vim:ts=4:sw=4:expandtab
 #
+# Please read the following documents before working on tests:
+# • https://build.i3wm.org/docs/testsuite.html
+#   (or docs/testsuite)
+#
+# • https://build.i3wm.org/docs/lib-i3test.html
+#   (alternatively: perldoc ./testcases/lib/i3test.pm)
+#
+# • https://build.i3wm.org/docs/ipc.html
+#   (or docs/ipc)
+#
+# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
+#   (unless you are already familiar with Perl)
+#
 # Verifies that scratchpad windows don’t move due to floating point caulcation
 # errors when repeatedly hiding/showing, no matter what display resolution.
 #
-use i3test i3_autostart => 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 683x768+0+0,1024x768+683+0
 EOT
-my $pid = launch_with_config($config);
-
-my $i3 = i3(get_socket_path());
 
+sync_with_i3;
 $x->root->warp_pointer(0, 0);
 sync_with_i3;
 
@@ -63,12 +72,11 @@ verify_scratchpad_doesnt_move($second);
 # now on the right output (1024x768)
 ################################################################################
 
+sync_with_i3;
 $x->root->warp_pointer(683 + 10, 0);
 sync_with_i3;
 
 my $third = fresh_workspace(output => 1);
 verify_scratchpad_doesnt_move($third);
 
-exit_gracefully($pid);
-
 done_testing;