From 7b86f410356941010402b2602eaf023b75438858 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Sat, 2 Oct 2010 20:16:54 +0200
Subject: [PATCH] test/run-interactive: Limit Xnest dimensions
---
test/feh.i | 9 +++++----
test/run-interactive | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/test/feh.i b/test/feh.i
index 313dab8..94ab138 100755
--- a/test/feh.i
+++ b/test/feh.i
@@ -4,7 +4,7 @@ use warnings;
use 5.010;
use Cwd;
-use Test::More tests => 70;
+use Test::More tests => 71;
use Time::HiRes qw/sleep/;
use X11::GUITest qw/:ALL/;
@@ -195,11 +195,12 @@ SendKeys('{HOM PGU}');
test_win_title($win, 'feh [96 of 100] - test/ok.png');
feh_stop();
-$win = feh_start('--thumbnails --thumb-title "%P [%l] %f"',
+$win = feh_start('--thumbnails -H 300 -W 310 --thumb-title "%P [%l] %f"',
'test/ok.png test/ok.gif test/ok.jpg');
test_win_title($win, 'feh [thumbnail mode]');
-$width = (GetWindowPos($win))[2];
-is($width, 640, 'thumbnail win: Correct default size');
+($width, $height) = (GetWindowPos($win))[2,3];
+is($width, 310, 'thumbnail win: Set correct width');
+is($height, 300, 'thumbnail win: Set correct height');
MoveMouseAbs(30, 30);
ClickMouseButton(M_BTN1);
($win) = WaitWindowViewable(qr{test/ok\.png$});
diff --git a/test/run-interactive b/test/run-interactive
index 2b38c00..d6f3fc4 100755
--- a/test/run-interactive
+++ b/test/run-interactive
@@ -1,8 +1,8 @@
#!/bin/sh
-Xnest :1 > /dev/null 2>&1 &
+Xnest -geometry 500x500 :7 > /dev/null 2>&1 &
pid=${!}
-DISPLAY=:1 prove -v test/feh.i
+DISPLAY=:7 prove -v test/feh.i
kill ${pid}
--
GitLab