functional tests: resolutions

diff --git a/lib/engine/functional.py b/lib/engine/functional.py
index ec267dab58c0a4e0610f7828ebafa387bc8cd40f..667e41bf22c809098a7dfb7ad08d5f7a0f0bd07c 100644 (file)
--- a/lib/engine/functional.py
+++ b/lib/engine/functional.py
@@ -21,11 +21,15 @@ class ListenerThread(Thread):
         Thread.__init__(self)
         address = ('localhost', 6000)
         self._listener = Listener(address)
-        self._conn = self._listener.accept()
+        self._listener._listener._socket.settimeout(15)
+        try:
+            self._conn = self._listener.accept()
+        except TimeoutError:
+            info('listener timeout')
         self._callbacks = callbacks
 
     def run(self):
-        running = True
+        running = hasattr(self, '_conn')
         while running:
             try:
                 msg = self._conn.recv()

diff --git a/lib/tools/functional_test.py b/lib/tools/functional_test.py
index 0101aff3fd72cbd01dc7b335b47d996934fab29e..8b0038d67990be171b35bf7011b5d86389844a7d 100644 (file)
--- a/lib/tools/functional_test.py
+++ b/lib/tools/functional_test.py
@@ -188,14 +188,14 @@ class FunctionalTest(GameObject):
         self._event(8 + FunctionalTest.evt_time, 'mouseclick', [(440, 120), 'left'])
         self._screenshot(8 + FunctionalTest.screenshot_time, 'back_from_fullscreen')
         # resolution
-        # self._event(FunctionalTest.evt_time, 'mouseclick', [(680, 340), 'left'])
-        # self._screenshot(FunctionalTest.screenshot_time, 'resolutions')
-        # self._event(FunctionalTest.evt_time, 'mouseclick', [(1020, 160), 'left'])
-        # self._screenshot(FunctionalTest.screenshot_time, '1440x900')
-        # self._event(FunctionalTest.evt_time, 'mouseclick', [(740, 400), 'left'])
-        # self._screenshot(FunctionalTest.screenshot_time, 'resolutions_2')
-        # self._event(FunctionalTest.evt_time, 'mouseclick', [(1110, 80), 'left'])
-        # self._screenshot(FunctionalTest.screenshot_time, '1360x768')
+        self._event(FunctionalTest.evt_time, 'mouseclick', [(680, 340), 'left'])
+        self._screenshot(FunctionalTest.screenshot_time, 'resolutions')
+        self._event(FunctionalTest.evt_time, 'mouseclick', [(1000, 400), 'left'])
+        self._screenshot(FunctionalTest.screenshot_time, '1440x900')
+        self._event(FunctionalTest.evt_time, 'mouseclick', [(740, 400), 'left'])
+        self._screenshot(FunctionalTest.screenshot_time, 'resolutions_2')
+        self._event(FunctionalTest.evt_time, 'mouseclick', [(1110, 80), 'left'])
+        self._screenshot(FunctionalTest.screenshot_time, '1360x768')
         # antialiasing
         self._event(FunctionalTest.evt_time, 'mouseclick', [(680, 440), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'antialiasing_yes')

diff --git a/prj.org b/prj.org
index 88010e82077a64a7349c55f165c7b23a7aeb0736..fa38403b6f7e21272714a4b54921ad8bab3996dd 100644 (file)
--- a/prj.org
+++ b/prj.org
@@ -3,9 +3,7 @@
 #+CATEGORY: pmachines
 #+TAGS: bug(b) calendar(c) waiting(w)
 
-* RED restore test resolutions
-* READY merge rc, stable
-* READY fix actions: rewind, prev, next                                 :bug:
+* RED fix actions: rewind, prev, next                                   :bug:
 * READY restore tests for level 6 and 7
 * READY move functional tests in tests from lib.engine
 * READY refactoring