python 3.10

diff --git a/game/app.py b/game/app.py
index 5015b8c3ffb47e30f82f28257b80f165fbeec5e0..7d2beb8568c3709b2d3b679bc1ffd55ac0e94306 100755 (executable)
--- a/game/app.py
+++ b/game/app.py
@@ -134,7 +134,7 @@ class PmachinesApp:
         load_prc_file_data('', 'framebuffer-srgb true')
         load_prc_file_data('', 'sync-video true')
         if args.functional_test or args.functional_ref:
-            load_prc_file_data('', 'win-size 1280 720')
+            load_prc_file_data('', 'win-size 1360 768')
             # otherwise it is not centered in exwm
         # load_prc_file_data('', 'threading-model Cull/Draw')
         # it freezes when you go to the next scene

diff --git a/lib/dictfile.py b/lib/dictfile.py
index 71994236d6333d6b3d8e97db02273bcfb4693932..fcf652b4056790d2f6dc3d7f2b834cd3ae92c23a 100644 (file)
--- a/lib/dictfile.py
+++ b/lib/dictfile.py
@@ -2,7 +2,7 @@ import sys
 from logging import info
 from os import makedirs
 from os.path import dirname
-from collections import Mapping
+from collections.abc import Mapping
 from configparser import ConfigParser
 from json import load, dumps
 from lib.gameobject import GameObject

diff --git a/lib/engine/functional.py b/lib/engine/functional.py
index ee6653abcb4f4f520d183c8dcc1fb8991c093ad2..88392fdf44a934681bd814a6c87bfc805373af5c 100644 (file)
--- a/lib/engine/functional.py
+++ b/lib/engine/functional.py
@@ -184,9 +184,9 @@ class FunctionalTest(GameObject):
         self._do_screenshots_exit()
 
     def _do_screenshots_credits(self):
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 410), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 450), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'credits_menu')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 630), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 680), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'main_menu_back_from_credits')
         # # go to credits
         # self._event(FunctionalTest.evt_time, 'joypad0-dpad_down', True)
@@ -208,65 +208,65 @@ class FunctionalTest(GameObject):
         # self._event(FunctionalTest.evt_time, 'arrow_up')
 
     def _do_screenshots_options(self):
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 270), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 300), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'options_menu')
         # languages
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 50), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 60), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'open_languages')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(930, 110), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(980, 120), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'options_menu_italian')
         # volume
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(703, 153), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(740, 163), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'options_menu_drag_1')
         # antialiasing
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 420), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 440), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'antialiasing_no')
         # shadows
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 510), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 540), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'shadows_no')
         # test aa and shadows
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 630), 'left'])  # back
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 130), 'left'])  # play
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(220, 150), 'left'])  # domino
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(845, 455), 'left'])  # close instructions
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 680), 'left'])  # back
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 140), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(230, 160), 'left'])  # domino
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(900, 490), 'left'])  # close instructions
         self._screenshot(FunctionalTest.screenshot_time, 'aa_no_shadows_no')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(25, 695), 'left'])  # home
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(25, 740), 'left'])  # home
 
     def _do_screenshots_restore_options(self):
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 270), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 300), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'options_menu_restored')
         # languages
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 50), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 60), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'open_languages_restored')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(930, 30), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(980, 20), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'options_menu_english')
         # volume
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(677, 153), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(719, 163), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'options_menu_drag_2')
         # fullscreen
         # the first one is because of the windowed mode in test
-        # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 240), 'left'])
+        # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 250), 'left'])
         # self._screenshot(FunctionalTest.screenshot_time, 'fullscreen')
-        # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 240), 'left'])
+        # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 250), 'left'])
         # self._screenshot(FunctionalTest.screenshot_time, 'fullscreen')
-        # self._event(8 + FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 240), 'left'])
+        # self._event(8 + FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 250), 'left'])
         # self._screenshot(8 + FunctionalTest.screenshot_time, 'back_from_fullscreen')
         # resolution
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 330), 'left'])
-        self._screenshot(FunctionalTest.screenshot_time, 'resolutions')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(950, 470), 'left'])
-        self._screenshot(FunctionalTest.screenshot_time, '1440x900')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(720, 410), 'left'])
-        self._screenshot(FunctionalTest.screenshot_time, 'resolutions_2')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1120, 420), 'left'])
-        self._screenshot(FunctionalTest.screenshot_time, '1280x720')
+        # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 340), 'left'])
+        # self._screenshot(FunctionalTest.screenshot_time, 'resolutions')
+        # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1020, 160), 'left'])
+        # self._screenshot(FunctionalTest.screenshot_time, '1440x900')
+        # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(740, 400), 'left'])
+        # self._screenshot(FunctionalTest.screenshot_time, 'resolutions_2')
+        # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1110, 80), 'left'])
+        # self._screenshot(FunctionalTest.screenshot_time, '1360x768')
         # antialiasing
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 420), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 440), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'antialiasing_yes')
         # shadows
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 510), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 540), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'shadows_yes')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 630), 'left'])  # back
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 680), 'left'])  # back
 
     #     # go to options
     #     self._event(FunctionalTest.evt_time, 'arrow_down')
@@ -300,97 +300,100 @@ class FunctionalTest(GameObject):
     #     self._event(FunctionalTest.evt_time, 'arrow_up')
 
     def _do_screenshots_play(self):
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 130), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 140), 'left'])  # play
         self._screenshot(FunctionalTest.screenshot_time, 'play_menu')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(220, 150), 'left'])  # domino scene
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 680), 'left'])  # back
+        self._screenshot(FunctionalTest.screenshot_time, 'back_from_play')
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 140), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(230, 160), 'left'])  # domino scene
         self._screenshot(FunctionalTest.screenshot_time, 'scene_domino_instructions')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(800, 455), 'left'])  # close instructions
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(850, 490), 'left'])  # close instructions
         self._screenshot(FunctionalTest.screenshot_time, 'scene_domino')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(25, 695), 'left'])  # home
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(25, 740), 'left'])  # home
         self._screenshot(FunctionalTest.screenshot_time, 'home_back_from_scene')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 130), 'left'])  # play
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(220, 150), 'left'])  # domino
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(800, 455), 'left'])  # close instructions
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(60, 695), 'left'])  # info
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 140), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(230, 160), 'left'])  # domino
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(850, 490), 'left'])  # close instructions
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(70, 740), 'left'])  # info
         self._screenshot(FunctionalTest.screenshot_time, 'info')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(800, 455), 'left'])  # close instructions
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(30, 50), (370, 220), 'left'])  # drag a piece
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(850, 490), 'left'])  # close instructions
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(35, 60), (430, 280), 'left'])  # drag a piece
         self._screenshot(FunctionalTest.screenshot_time, 'domino_dragged')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(500, 340), 'left'])  # rewind
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1220, 740), 'left'])  # rewind
         self._screenshot(FunctionalTest.screenshot_time, 'rewind')
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(30, 50), (525, 350), 'left'])  # drag a piece
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(30, 510), (670, 350), 'left'])  # drag a piece
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(35, 60), (550, 380), 'left'])  # drag a piece
+        # self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(35, 60), (715, 380), 'left'])  # drag a piece
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1340, 740), 'left'])  # play
         self._screenshot(16 + FunctionalTest.screenshot_time, 'fail_domino')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(590, 420), 'left'])  # home
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(630, 450), 'left'])  # home
         self._screenshot(FunctionalTest.screenshot_time, 'home_back_from_fail')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 130), 'left'])  # play
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(220, 150), 'left'])  # domino
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(800, 455), 'left'])  # close instructions
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(30, 50), (525, 350), 'left'])  # drag a piece
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(30, 50), (670, 350), 'left'])  # drag a piece
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 140), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(230, 160), 'left'])  # domino
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(850, 490), 'left'])  # close instructions
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(35, 60), (550, 380), 'left'])  # drag a piece
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(35, 60), (715, 380), 'left'])  # drag a piece
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1340, 740), 'left'])  # play
         self._screenshot(16 + FunctionalTest.screenshot_time, 'fail_domino_2')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 420), 'left'])  # replay
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(30, 50), (540, 140), 'left'])  # drag a piece
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(540, 130), (600, 130), 'right'])  # rotate the piece
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(30, 50), (665, 355), 'left'])  # drag a piece
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 450), 'left'])  # replay
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(35, 60), (570, 380), 'left'])  # drag a piece
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(570, 355), (605, 355), 'right'])  # rotate the piece
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(35, 60), (715, 380), 'left'])  # drag a piece
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1340, 740), 'left'])  # play
         self._screenshot(16 + FunctionalTest.screenshot_time, 'win_domino')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(690, 420), 'left'])  # next
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(735, 450), 'left'])  # next
         self._screenshot(FunctionalTest.screenshot_time, 'scene_box')
         # scene 2
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(830, 455), 'left'])  # close instructions
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (660, 585), 'left'])  # drag a box
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (660, 515), 'left'])  # drag a box
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(880, 490), 'left'])  # close instructions
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(65, 60), (710, 620), 'left'])  # drag a box
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(65, 60), (710, 540), 'left'])  # drag a box
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1340, 740), 'left'])  # play
         self._screenshot(16 + FunctionalTest.screenshot_time, 'fail_box')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 420), 'left'])  # replay
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (660, 585), 'left'])  # drag a box
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (660, 515), 'left'])  # drag a box
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (660, 430), 'left'])  # drag a box
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 450), 'left'])  # replay
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(65, 60), (710, 620), 'left'])  # drag a box
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(65, 60), (710, 540), 'left'])  # drag a box
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(65, 60), (705, 460), 'left'])  # drag a box
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1340, 740), 'left'])  # play
         self._screenshot(16 + FunctionalTest.screenshot_time, 'win_box')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(690, 420), 'left'])  # next
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(735, 450), 'left'])  # next
         self._screenshot(FunctionalTest.screenshot_time, 'scene_box_domino')
         # scene 3
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(875, 455), 'left'])  # close instructions
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (865, 415), 'left'])  # drag a box
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (865, 330), 'left'])  # drag a box
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(930, 485), 'left'])  # close instructions
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(65, 60), (910, 440), 'left'])  # drag a box
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(65, 60), (910, 360), 'left'])  # drag a box
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1340, 740), 'left'])  # play
         self._screenshot(16 + FunctionalTest.screenshot_time, 'fail_box_domino')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 420), 'left'])  # replay
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (860, 415), 'left'])  # drag a box
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (775, 235), 'left'])  # drag a box
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 450), 'left'])  # replay
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(65, 60), (910, 440), 'left'])  # drag a box
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(65, 60), (835, 250), 'left'])  # drag a box
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1340, 740), 'left'])  # play
         self._screenshot(16 + FunctionalTest.screenshot_time, 'win_box_domino')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(690, 420), 'left'])  # next
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(735, 450), 'left'])  # next
         self._screenshot(FunctionalTest.screenshot_time, 'scene_basketball')
         # scene 4
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(820, 455), 'left'])  # close instructions
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (630, 300), 'left'])  # drag a ball
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(870, 490), 'left'])  # close instructions
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(55, 50), (650, 310), 'left'])  # drag a ball
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1340, 740), 'left'])  # play
         self._screenshot(16 + FunctionalTest.screenshot_time, 'fail_basketball')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 420), 'left'])  # replay
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (360, 150), 'left'])  # drag a ball
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 450), 'left'])  # replay
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(55, 50), (380, 50), 'left'])  # drag a ball
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1340, 740), 'left'])  # play
         self._screenshot(16 + FunctionalTest.screenshot_time, 'win_basketball')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(690, 420), 'left'])  # next
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(735, 450), 'left'])  # next
         self._screenshot(FunctionalTest.screenshot_time, 'scene_domino_box_basketball')
         # scene 5
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(815, 455), 'left'])  # close instructions
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (550, 415), 'left'])  # drag a box
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(30, 50), (560, 340), 'left'])  # drag a piece
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(865, 490), 'left'])  # close instructions
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(65, 60), (580, 440), 'left'])  # drag a box
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(30, 60), (590, 370), 'left'])  # drag a piece
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1340, 740), 'left'])  # play
         self._screenshot(16 + FunctionalTest.screenshot_time, 'fail_domino_box_basketball')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 420), 'left'])  # replay
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (550, 415), 'left'])  # drag a box
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(30, 50), (618, 412), 'left'])  # drag a piece
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(620, 430), (660, 425), 'right'])  # rotate a piece
-        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(615, 415), (615, 420), 'left'])  # drag a piece
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 450), 'left'])  # replay
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(65, 60), (580, 440), 'left'])  # drag a box
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(30, 60), (660, 440), 'left'])  # drag a piece
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(660, 425), (625, 425), 'right'])  # rotate a piece
+        self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(660, 435), (650, 445), 'left'])  # drag a piece
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1340, 740), 'left'])  # play
         self._screenshot(16 + FunctionalTest.screenshot_time, 'win_domino_box_basketball')
-        # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(690, 420), 'left'])  # next
+        # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(735, 450), 'left'])  # next
         # self._screenshot(FunctionalTest.screenshot_time, 'scene_teeter_tooter')
         # # scene 6
         # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(820, 455), 'left'])  # close instructions
@@ -404,7 +407,7 @@ class FunctionalTest(GameObject):
         # self._screenshot(16 + FunctionalTest.screenshot_time, 'win_teeter_tooter')
         # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(690, 420), 'left'])  # next
         # self._screenshot(FunctionalTest.screenshot_time, 'scene_teeter_domino_box_basketball')
-        # scene 7
+        # # scene 7
         # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(880, 455), 'left'])  # close instructions
         # self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(60, 60), (155, 180), 'left'])  # drag a box
         # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
@@ -414,7 +417,7 @@ class FunctionalTest(GameObject):
         # self._event(FunctionalTest.evt_time, 'mousedrag', False, False, [(195, 50), (195, 80), 'right'])  # rotate a box
         # self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(1260, 695), 'left'])  # play
         # self._screenshot(16 + FunctionalTest.screenshot_time, 'win_teeter_domino_box_basketball')
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(590, 420), 'left'])  # home
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(630, 450), 'left'])  # home
         self._screenshot(FunctionalTest.screenshot_time, 'home_from_play')
 
     def _do_screenshots_exit(self):
@@ -428,7 +431,7 @@ class FunctionalTest(GameObject):
         self._verify()
         # self._event(FunctionalTest.evt_time, 'rcontrol')
         # self._exit()
-        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(640, 560), 'left'])
+        self._event(FunctionalTest.evt_time, 'mouseclick', False, False, [(680, 600), 'left'])
 
 
     def _do_screenshots_2(self):

diff --git a/setup.py b/setup.py
index 0984091f5934ff8fdeb65414b98172b898823494..934ffff012a8a59f3afee167371d7b0ad0c54c08 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -150,8 +150,8 @@ if __name__ == '__main__':
         platform_lst += ['win_amd64']
         installers_dct['win_amd64'] = ['nsis']
     if all('--nolinux' not in arg for arg in argv):
-        platform_lst += ['manylinux1_x86_64']
-        installers_dct['manylinux1_x86_64'] = []
+        platform_lst += ['manylinux2010_x86_64']
+        installers_dct['manylinux2010_x86_64'] = []
     log_path = '$USER_APPDATA/pmachines/logs/%Y/%B/%d/%H_%M_%S.log'
     package_data_dirs = {'simplepbr': [('simplepbr/shaders*', '', {})]}
     setup(

diff --git a/tests/test_functional.py b/tests/test_functional.py
index 2971f05e97545607e96a167b6229e555c15eab3a..c4fa328b406a1480392876bfccea2a685f48b840 100644 (file)
--- a/tests/test_functional.py
+++ b/tests/test_functional.py
@@ -102,49 +102,49 @@ class FunctionalTests(TestCase):
             './dist/Pmachines%s-x86_64.AppImage --functional-test 2' % (bld_branch, bld_branch),
             str(Path.home()) + '/.local/share/pmachines/tests/functional/')
 
-    def test_flatpak(self):
-        info('test_flatpak')
-        if environ.get('FUNCTIONALPOST') != '1':
-            self.skipTest('skipped functional-post tests')
-        bld_branch = {'master': 'alpha', 'rc': 'rc', 'stable': 'stable'}[_branch()]
-        cmd = 'flatpak update -y it.ya2.Pmachines//%s' % bld_branch
-        info('executing: %s' % cmd)
-        system(cmd)
-        info('executed: %s' % cmd)
-        self.__test_template(
-            'flatpak run it.ya2.Pmachines//%s --functional-test 1 ;'
-            'flatpak run it.ya2.Pmachines//%s --functional-test 2' % (bld_branch, bld_branch),
-            str(Path.home()) + '/.var/app/it.ya2.Pmachines/data/pmachines/tests/functional/')
-
-    def __update_itchio(self):
-        system('/home/flavio/.itch/itch')
-        sleep(5)
-        system('xdotool mousemove 860 620')
-        sleep(1)
-        system('xdotool click 1')
-        sleep(300)
-        system('killall itch')
-
-    def test_itchio(self):
-        info('test_itchio')
-        if environ.get('FUNCTIONALPOST') != '1':
-            self.skipTest('skipped functional-post tests')
-        if _branch() != 'master':
-            return
-        self.__update_itchio()
-        self.__test_template(
-            '/home/flavio/.config/itch/apps/pmachines/pmachines --functional-test 1 ;'
-            '/home/flavio/.config/itch/apps/pmachines/pmachines --functional-test 2',
-            str(Path.home()) + '/.local/share/pmachines/tests/functional/')
-
-    def test_windows(self):
-        info('test_windows')
-        system('pkill -f "pmachines.exe"')
-        abspath = str(Path(__file__).parent.parent) + '/build/win_amd64/pmachines.exe'
-        self.__test_template(
-            'timeout 720s wine %s --functional-test 1 ; '
-            'timeout 720s wine %s --functional-test 2' % (abspath, abspath),
-            str(Path.home()) + '/.wine/drive_c/users/flavio/AppData/Local/pmachines/tests/functional/')
+    # def test_flatpak(self):
+    #     info('test_flatpak')
+    #     if environ.get('FUNCTIONALPOST') != '1':
+    #         self.skipTest('skipped functional-post tests')
+    #     bld_branch = {'master': 'alpha', 'rc': 'rc', 'stable': 'stable'}[_branch()]
+    #     cmd = 'flatpak update -y it.ya2.Pmachines//%s' % bld_branch
+    #     info('executing: %s' % cmd)
+    #     system(cmd)
+    #     info('executed: %s' % cmd)
+    #     self.__test_template(
+    #         'flatpak run it.ya2.Pmachines//%s --functional-test 1 ;'
+    #         'flatpak run it.ya2.Pmachines//%s --functional-test 2' % (bld_branch, bld_branch),
+    #         str(Path.home()) + '/.var/app/it.ya2.Pmachines/data/pmachines/tests/functional/')
+
+    # def __update_itchio(self):
+    #     system('/home/flavio/.itch/itch')
+    #     sleep(5)
+    #     system('xdotool mousemove 860 620')
+    #     sleep(1)
+    #     system('xdotool click 1')
+    #     sleep(300)
+    #     system('killall itch')
+
+    # def test_itchio(self):
+    #     info('test_itchio')
+    #     if environ.get('FUNCTIONALPOST') != '1':
+    #         self.skipTest('skipped functional-post tests')
+    #     if _branch() != 'master':
+    #         return
+    #     self.__update_itchio()
+    #     self.__test_template(
+    #         '/home/flavio/.config/itch/apps/pmachines/pmachines --functional-test 1 ;'
+    #         '/home/flavio/.config/itch/apps/pmachines/pmachines --functional-test 2',
+    #         str(Path.home()) + '/.local/share/pmachines/tests/functional/')
+
+    # def test_windows(self):
+    #     info('test_windows')
+    #     system('pkill -f "pmachines.exe"')
+    #     abspath = str(Path(__file__).parent.parent) + '/build/win_amd64/pmachines.exe'
+    #     self.__test_template(
+    #         'timeout 720s wine %s --functional-test 1 ; '
+    #         'timeout 720s wine %s --functional-test 2' % (abspath, abspath),
+    #         str(Path.home()) + '/.wine/drive_c/users/flavio/AppData/Local/pmachines/tests/functional/')
 
     def test_versions(self):
         info('test_versions')
@@ -162,15 +162,15 @@ class FunctionalTests(TestCase):
                 _ver = fver.read().strip() + '-'
         exp = '%s-%s' % (_ver, commit)
         cmds = [
-            ('./build/manylinux1_x86_64/pmachines --version', str(Filename.get_user_appdata_directory()) + '/pmachines/obs_version.txt'),
+            ('./build/manylinux2010_x86_64/pmachines --version', str(Filename.get_user_appdata_directory()) + '/pmachines/obs_version.txt'),
             ('./dist/Pmachines-%s-x86_64.AppImage --version' % bld_branch, str(Filename.get_user_appdata_directory()) + '/pmachines/obs_version.txt'),
-            ('timeout 720s wine ./build/win_amd64/pmachines.exe --version', '/home/flavio/.wine/drive_c/users/flavio/AppData/Local/pmachines/obs_version.txt')
+            #('timeout 720s wine ./build/win_amd64/pmachines.exe --version', '/home/flavio/.wine/drive_c/users/flavio/AppData/Local/pmachines/obs_version.txt')
             ]
-        if environ.get('FUNCTIONALPOST') == '1':
-            if _branch() == 'master':
-                self.__update_itchio()
-                cmds += [('/home/flavio/.config/itch/apps/pmachines/pmachines --version', str(Filename.get_user_appdata_directory()) + '/pmachines/obs_version.txt')]
-            cmds += [('flatpak run it.ya2.Pmachines//%s --version' % bld_branch, '/home/flavio/.var/app/it.ya2.Pmachines/data/pmachines/obs_version.txt')]
+        #if environ.get('FUNCTIONALPOST') == '1':
+        #    if _branch() == 'master':
+        #        self.__update_itchio()
+        #        cmds += [('/home/flavio/.config/itch/apps/pmachines/pmachines --version', str(Filename.get_user_appdata_directory()) + '/pmachines/obs_version.txt')]
+        #    cmds += [('flatpak run it.ya2.Pmachines//%s --version' % bld_branch, '/home/flavio/.var/app/it.ya2.Pmachines/data/pmachines/obs_version.txt')]
         system('flatpak update -y it.ya2.Pmachines//%s' % bld_branch)
         for cmd in cmds:
             if exists(cmd[1]):

diff --git a/tests/test_setup.py b/tests/test_setup.py
index 82a48c0acbf381664c0d2c1db20605b126c593f7..22f9be0b853fc23d01c3f3e63b84bc87619b8a20 100644 (file)
--- a/tests/test_setup.py
+++ b/tests/test_setup.py
@@ -7,6 +7,7 @@ from os.path import exists
 from unittest import TestCase
 from setuptools.dist import Distribution
 from setup import AbsCmd
+from lib.build.build import exec_cmd
 
 
 class SetupTests(TestCase):
@@ -19,7 +20,8 @@ class SetupTests(TestCase):
 
     def test_cores(self):
         cmd = AbsCmd(Distribution())
-        self.assertEqual(cmd.cores, 4)
+        ncores = int(exec_cmd('grep -c ^processor /proc/cpuinfo'))
+        self.assertEqual(cmd.cores, ncores)
         sys.argv += ['--cores=2']
         cmd = AbsCmd(Distribution())
         self.assertEqual(cmd.cores, 2)