From: Michael Stapelberg Date: Thu, 14 Jul 2011 23:37:54 +0000 (+0200) Subject: testcases: explicitly mark the (short) config files as v4 X-Git-Tag: tree-pr4~4 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=feaa161d2c9ecbf46dab8bf13c4fb5d54c97ea70;p=i3%2Fi3 testcases: explicitly mark the (short) config files as v4 i3 won’t call i3-migrate-config and thus won’t add a call to i3bar this way. It’s not necessary and can interfere with some tests sometimes. --- diff --git a/testcases/t/59-socketpaths.t b/testcases/t/59-socketpaths.t index 9fc77910..33350927 100644 --- a/testcases/t/59-socketpaths.t +++ b/testcases/t/59-socketpaths.t @@ -19,6 +19,7 @@ my $i3_path = abs_path("../i3"); ##################################################################### my ($fh, $tmpfile) = tempfile(); +say $fh "# i3 config file (v4)"; say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; close($fh); @@ -67,6 +68,7 @@ $socketpath = $tmpdir . "/config.sock"; ok(! -e $socketpath, "$socketpath does not exist yet"); ($fh, $tmpfile) = tempfile(); +say $fh "# i3 config file (v4)"; say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; say $fh "ipc-socket $socketpath"; close($fh); diff --git a/testcases/t/66-assign.t b/testcases/t/66-assign.t index 84d71930..06b4bf2b 100644 --- a/testcases/t/66-assign.t +++ b/testcases/t/66-assign.t @@ -42,6 +42,7 @@ sub set_wm_class { ##################################################################### my ($fh, $tmpfile) = tempfile(); +say $fh "# i3 config file (v4)"; say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; say $fh "ipc-socket /tmp/nestedcons"; close($fh); @@ -83,6 +84,7 @@ sleep 0.25; ##################################################################### ($fh, $tmpfile) = tempfile(); +say $fh "# i3 config file (v4)"; say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; say $fh "ipc-socket /tmp/nestedcons"; say $fh q|assign "special" → targetws|; @@ -168,6 +170,7 @@ exit_gracefully($process->pid); ##################################################################### ($fh, $tmpfile) = tempfile(); +say $fh "# i3 config file (v4)"; say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; say $fh "ipc-socket /tmp/nestedcons"; say $fh q|assign "special" → ~|; diff --git a/testcases/t/67-workspace_layout.t b/testcases/t/67-workspace_layout.t index 46d0c274..b9f697dc 100644 --- a/testcases/t/67-workspace_layout.t +++ b/testcases/t/67-workspace_layout.t @@ -23,6 +23,7 @@ my $i3_path = abs_path("../i3"); ##################################################################### my ($fh, $tmpfile) = tempfile(); +say $fh "# i3 config file (v4)"; say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; say $fh "ipc-socket /tmp/nestedcons"; close($fh); @@ -54,6 +55,7 @@ exit_gracefully($process->pid); ##################################################################### ($fh, $tmpfile) = tempfile(); +say $fh "# i3 config file (v4)"; say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; say $fh "ipc-socket /tmp/nestedcons"; say $fh "workspace_layout stacked"; diff --git a/testcases/t/70-force_focus_wrapping.t b/testcases/t/70-force_focus_wrapping.t index fededf58..5bd68c79 100644 --- a/testcases/t/70-force_focus_wrapping.t +++ b/testcases/t/70-force_focus_wrapping.t @@ -21,6 +21,7 @@ my $i3_path = abs_path("../i3"); ##################################################################### my ($fh, $tmpfile) = tempfile(); +say $fh "# i3 config file (v4)"; say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; say $fh "ipc-socket /tmp/nestedcons"; close($fh); @@ -66,6 +67,7 @@ exit_gracefully($process->pid); ##################################################################### ($fh, $tmpfile) = tempfile(); +say $fh "# i3 config file (v4)"; say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; say $fh "ipc-socket /tmp/nestedcons"; say $fh "force_focus_wrapping true";