fixes for testing: resolution

diff --git a/lib/tools/functional_test.py b/lib/tools/functional_test.py
index 50323a5cf592b9a4a51fa3ba477cfd633b87c823..47f4718d7fd351a827f417428592e4e0666b2738 100644 (file)
--- a/lib/tools/functional_test.py
+++ b/lib/tools/functional_test.py
@@ -186,12 +186,13 @@ class FunctionalTest(GameObject):
         self._screenshot(FunctionalTest.screenshot_time, 'fullscreen')
         self._event(FunctionalTest.evt_time, 'mouseclick', [(680, 250), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'fullscreen')
         self._screenshot(FunctionalTest.screenshot_time, 'fullscreen')
         self._event(FunctionalTest.evt_time, 'mouseclick', [(680, 250), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'fullscreen')

-        self._event(8 + FunctionalTest.evt_time, 'mouseclick', [(440, 120), 'left'])
+        #self._event(8 + FunctionalTest.evt_time, 'mouseclick', [(440, 120), 'left'])
+        self._event(8 + FunctionalTest.evt_time, 'mouseclick', [(680, 250), '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._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', [(1000, 400), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', [(1000, 440), 'left'])

         self._screenshot(FunctionalTest.screenshot_time, '1440x900')
         self._event(FunctionalTest.evt_time, 'mouseclick', [(740, 400), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'resolutions_2')
         self._screenshot(FunctionalTest.screenshot_time, '1440x900')
         self._event(FunctionalTest.evt_time, 'mouseclick', [(740, 400), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'resolutions_2')

diff --git a/prj.org b/prj.org
index fa38403b6f7e21272714a4b54921ad8bab3996dd..665a6beb3e182bb5b4dc9b8636030c6092576d1d 100644 (file)
--- a/prj.org
+++ b/prj.org
@@ -10,7 +10,6 @@
 * BACKLOG improve level domino box basketball: it can be solved trivially
 * BACKLOG bug 3.10-windows: restore windows builds when it's fixed
 * BACKLOG optimize slow tests
 * BACKLOG improve level domino box basketball: it can be solved trivially
 * BACKLOG bug 3.10-windows: restore windows builds when it's fixed
 * BACKLOG optimize slow tests

-* BACKLOG distutils is deprecated

 * BACKLOG do intro video with moviepy
 * BACKLOG flatpak 21.08
 * BACKLOG intro animation (from target item to start position)
 * BACKLOG do intro video with moviepy
 * BACKLOG flatpak 21.08
 * BACKLOG intro animation (from target item to start position)

diff --git a/setup.py b/setup.py
index 934ffff012a8a59f3afee167371d7b0ad0c54c08..83b73304830a3879a71b5ba43160a7ea6187c473 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -7,8 +7,7 @@ from os import system, getcwd, chdir
 from sys import argv, executable
 from collections import namedtuple
 from subprocess import Popen
 from sys import argv, executable
 from collections import namedtuple
 from subprocess import Popen

-from distutils.cmd import Command
-from setuptools import setup
+from setuptools import setup, Command

 from setuptools.command.develop import develop
 from multiprocessing import cpu_count
 from direct.dist.commands import bdist_apps
 from setuptools.command.develop import develop
 from multiprocessing import cpu_count
 from direct.dist.commands import bdist_apps