t/70-force-focus-wrapping: use launch_with_config

This commit is contained in:
Michael Stapelberg 2011-08-03 02:12:29 +02:00
parent 7956289c2b
commit 003f7043c5
1 changed files with 11 additions and 36 deletions

View File

@ -5,37 +5,21 @@
# Tests if the 'force_focus_wrapping' config directive works correctly. # Tests if the 'force_focus_wrapping' config directive works correctly.
# #
use i3test; use i3test;
use Cwd qw(abs_path);
use Proc::Background;
use File::Temp qw(tempfile tempdir);
use X11::XCB qw(:all); use X11::XCB qw(:all);
use X11::XCB::Connection; use X11::XCB::Connection;
my $x = X11::XCB::Connection->new; my $x = X11::XCB::Connection->new;
# assuming we are run by complete-run.pl
my $i3_path = abs_path("../i3");
my $socketpath = File::Temp::tempnam('/tmp', 'i3-test-socket-');
##################################################################### #####################################################################
# 1: test the wrapping behaviour without force_focus_wrapping # 1: test the wrapping behaviour without force_focus_wrapping
##################################################################### #####################################################################
my ($fh, $tmpfile) = tempfile(); my $config = <<EOT;
say $fh "# i3 config file (v4)"; # i3 config file (v4)
say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
say $fh "ipc-socket $socketpath"; EOT
close($fh);
diag("Starting i3"); my $process = launch_with_config($config);
my $i3cmd = "exec " . abs_path("../i3") . " -V -d all --disable-signalhandler -c $tmpfile >/dev/null 2>/dev/null";
my $process = Proc::Background->new($i3cmd);
sleep 1;
# force update of the cached socket path in lib/i3test
get_socket_path(0);
diag("pid = " . $process->pid);
my $tmp = fresh_workspace; my $tmp = fresh_workspace;
@ -70,22 +54,13 @@ exit_gracefully($process->pid);
# 2: test the wrapping behaviour with force_focus_wrapping # 2: test the wrapping behaviour with force_focus_wrapping
##################################################################### #####################################################################
($fh, $tmpfile) = tempfile(); $config = <<EOT;
say $fh "# i3 config file (v4)"; # i3 config file (v4)
say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
say $fh "ipc-socket $socketpath"; force_focus_wrapping true
say $fh "force_focus_wrapping true"; EOT
close($fh);
diag("Starting i3"); $process = launch_with_config($config);
$i3cmd = "exec " . abs_path("../i3") . " -V -d all --disable-signalhandler -c $tmpfile >/dev/null 2>/dev/null";
$process = Proc::Background->new($i3cmd);
sleep 1;
# force update of the cached socket path in lib/i3test
get_socket_path(0);
diag("pid = " . $process->pid);
$tmp = fresh_workspace; $tmp = fresh_workspace;