Merge pull request #129 from DakaraProject/fix/ci_integration_windows

Fix failing integration tests for Windows

Author: Neraste

.github/workflows/ci.yml

@@ -56,11 +56,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: "pip"
-
       - name: Install native dependencies (Ubuntu)
         run: sudo apt-get update && sudo apt-get install -y vlc mpv
         if: matrix.os == 'ubuntu-latest'
@@ -92,6 +87,11 @@ jobs:
       - name: Print Mpv version
         run: mpv --version
 
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+          cache: "pip"
+
       - name: Install python tests dependencies
         run: pip install -e ".[dev]"
 

tests/integration/test_media_player_mpv.py

@@ -18,7 +18,9 @@
 from dakara_player.media_player.mpv import MediaPlayerMpv
 from tests.integration.base import TestCasePollerKara
 
-REWIND_FAST_FORWARD_DURATION = 0.2
+REWIND_FAST_FORWARD_DURATION = 0.5
+REWIND_FAST_FORWARD_DELTA = 1
+DEFAULT_DELTA = 0.2
 
 
 @skipUnless(MediaPlayerMpv.is_available(), "mpv not installed")
@@ -427,7 +429,7 @@ def test_restart_song(self):
             mpv_player.restart()
 
             # check timing is 0
-            self.assertAlmostEqual(mpv_player.player.time_pos, 0, 0)
+            self.assertAlmostEqual(mpv_player.player.time_pos, 0, delta=DEFAULT_DELTA)
 
             # check the song is not stopped
             self.assertIsNotNone(mpv_player.playlist_entry)
@@ -768,7 +770,11 @@ def test_rewind_song(self):
             # check timing is earlier than previously
             timing2 = mpv_player.player.time_pos
             self.assertLess(timing2, timing1)
-            self.assertAlmostEqual(timing1 - timing2, REWIND_FAST_FORWARD_DURATION, 1)
+            self.assertAlmostEqual(
+                timing1 - timing2,
+                REWIND_FAST_FORWARD_DURATION,
+                delta=REWIND_FAST_FORWARD_DELTA,
+            )
 
             # assert callback
             mpv_player.callbacks["updated_timing"].assert_called_with(
@@ -800,7 +806,7 @@ def test_rewind_song_before_start(self):
             mpv_player.rewind()
 
             # check timing is 0
-            self.assertAlmostEqual(mpv_player.player.time_pos, 0, 0)
+            self.assertAlmostEqual(mpv_player.player.time_pos, 0, delta=DEFAULT_DELTA)
 
     @func_set_timeout(TIMEOUT)
     def test_fast_forward_song(self):
@@ -842,7 +848,11 @@ def test_fast_forward_song(self):
             # check timing is later than previously
             timing2 = mpv_player.player.time_pos
             self.assertGreater(timing2, timing1)
-            self.assertAlmostEqual(timing2 - timing1, REWIND_FAST_FORWARD_DURATION, 1)
+            self.assertAlmostEqual(
+                timing2 - timing1,
+                REWIND_FAST_FORWARD_DURATION,
+                delta=REWIND_FAST_FORWARD_DELTA,
+            )
 
             # assert callback
             mpv_player.callbacks["updated_timing"].assert_called_with(

tests/integration/test_media_player_vlc.py

@@ -20,6 +20,8 @@
 from tests.integration.base import TestCasePollerKara
 
 REWIND_FAST_FORWARD_DURATION = 0.5
+REWIND_FAST_FORWARD_DELTA = 0.5
+DEFAULT_DELTA = 0.2
 
 
 @skipUnless(MediaPlayerVlc.is_available(), "VLC not installed")
@@ -525,7 +527,7 @@ def test_restart_song(self):
             vlc_player.restart()
 
             # check timing is 0
-            self.assertAlmostEqual(vlc_player.player.get_time(), 0, 0)
+            self.assertAlmostEqual(vlc_player.player.get_time(), 0, delta=DEFAULT_DELTA)
 
             # check the song is not stopped
             self.assertIsNotNone(vlc_player.playlist_entry)
@@ -683,7 +685,11 @@ def test_rewind_song(self):
             # check timing is earlier than previously
             timing2 = vlc_player.player.get_time() / 1000
             self.assertLess(timing2, timing1)
-            self.assertAlmostEqual(timing1 - timing2, REWIND_FAST_FORWARD_DURATION, 1)
+            self.assertAlmostEqual(
+                timing1 - timing2,
+                REWIND_FAST_FORWARD_DURATION,
+                delta=REWIND_FAST_FORWARD_DELTA,
+            )
 
     @func_set_timeout(TIMEOUT)
     def test_rewind_song_before_start(self):
@@ -712,7 +718,7 @@ def test_rewind_song_before_start(self):
             vlc_player.rewind()
 
             # check timing is 0
-            self.assertAlmostEqual(vlc_player.player.get_time(), 0, 0)
+            self.assertAlmostEqual(vlc_player.player.get_time(), 0, delta=DEFAULT_DELTA)
 
     @func_set_timeout(TIMEOUT)
     def test_fast_forward_song(self):
@@ -757,7 +763,11 @@ def test_fast_forward_song(self):
             # check timing is earlier than previously
             timing2 = vlc_player.player.get_time() / 1000
             self.assertGreater(timing2, timing1)
-            self.assertAlmostEqual(timing2 - timing1, REWIND_FAST_FORWARD_DURATION, 1)
+            self.assertAlmostEqual(
+                timing2 - timing1,
+                REWIND_FAST_FORWARD_DURATION,
+                delta=REWIND_FAST_FORWARD_DELTA,
+            )
 
             # assert callback
             vlc_player.callbacks["updated_timing"].assert_called_with(