From bd3cdbcdbd807275dcdd01819f595da6bc882f31 Mon Sep 17 00:00:00 2001
From: Bibo-Joshi <22366557+Bibo-Joshi@users.noreply.github.com>
Date: Sun, 22 Sep 2024 19:49:48 +0200
Subject: [PATCH] Update `pytest-xdist` Usage (#4491)

---
 .github/workflows/unit_tests.yml | 10 +++++-----
 tests/test_bot.py                | 21 +--------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index a8acc04a8..67a0bb80c 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -37,7 +37,7 @@ jobs:
           python -W ignore -m pip install -U pytest-cov
           python -W ignore -m pip install .
           python -W ignore -m pip install -r requirements-unit-tests.txt
-          python -W ignore -m pip install pytest-xdist[psutil]
+          python -W ignore -m pip install pytest-xdist
 
       - name: Test with pytest
         # We run 4 different suites here
@@ -63,10 +63,10 @@ jobs:
           # Test the rest
           export TEST_WITH_OPT_DEPS='true'
           pip install .[all]
-          # `-n auto --dist loadfile` uses pytest-xdist to run each test file on a different CPU
-          # worker. Increasing number of workers has little effect on test duration, but it seems
-          # to increase flakyness, specially on python 3.7 with --dist=loadgroup.
-          pytest -v --cov --cov-append -n auto --dist loadfile --junit-xml=.test_report_optionals_junit.xml
+          # `-n auto --dist worksteal` uses pytest-xdist to run tests on multiple CPU
+          # workers. Increasing number of workers has little effect on test duration, but it seems
+          # to increase flakyness.
+          pytest -v --cov --cov-append -n auto --dist worksteal --junit-xml=.test_report_optionals_junit.xml
           main_status=$?
           # exit with non-zero status if any of the two pytest runs failed
           exit $(( ${opt_dep_status} || ${main_status} ))
diff --git a/tests/test_bot.py b/tests/test_bot.py
index b8cdf5f17..12745827e 100644
--- a/tests/test_bot.py
+++ b/tests/test_bot.py
@@ -3007,7 +3007,6 @@ class TestBotWithRequest:
     async def test_edit_reply_markup_inline(self):
         pass
 
-    @pytest.mark.xdist_group("getUpdates_and_webhook")
     # TODO: Actually send updates to the test bot so this can be tested properly
     async def test_get_updates(self, bot):
         await bot.delete_webhook()  # make sure there is no webhook set if webhook tests failed
@@ -3074,7 +3073,6 @@ class TestBotWithRequest:
         await bot.get_updates(read_timeout=read_timeout, timeout=timeout)
         assert caught_read_timeout == expected
 
-    @pytest.mark.xdist_group("getUpdates_and_webhook")
     @pytest.mark.parametrize("use_ip", [True, False])
     # local file path as file_input is tested below in test_set_webhook_params
     @pytest.mark.parametrize("file_input", ["bytes", "file_handle"])
@@ -3209,10 +3207,8 @@ class TestBotWithRequest:
         protected = await default_bot.send_game(chat_id, "test_game", protect_content=val)
         assert protected.has_protected_content is val
 
-    @pytest.mark.xdist_group("game")
     @xfail
-    async def test_set_game_score_1(self, bot, chat_id):
-        # NOTE: numbering of methods assures proper order between test_set_game_scoreX methods
+    async def test_set_game_score_and_high_scores(self, bot, chat_id):
         # First, test setting a score.
         game_short_name = "test_game"
         game = await bot.send_game(chat_id, game_short_name)
@@ -3229,10 +3225,6 @@ class TestBotWithRequest:
         assert message.game.animation.file_unique_id == game.game.animation.file_unique_id
         assert message.game.text != game.game.text
 
-    @pytest.mark.xdist_group("game")
-    @xfail
-    async def test_set_game_score_2(self, bot, chat_id):
-        # NOTE: numbering of methods assures proper order between test_set_game_scoreX methods
         # Test setting a score higher than previous
         game_short_name = "test_game"
         game = await bot.send_game(chat_id, game_short_name)
@@ -3252,10 +3244,6 @@ class TestBotWithRequest:
         assert message.game.animation.file_unique_id == game.game.animation.file_unique_id
         assert message.game.text == game.game.text
 
-    @pytest.mark.xdist_group("game")
-    @xfail
-    async def test_set_game_score_3(self, bot, chat_id):
-        # NOTE: numbering of methods assures proper order between test_set_game_scoreX methods
         # Test setting a score lower than previous (should raise error)
         game_short_name = "test_game"
         game = await bot.send_game(chat_id, game_short_name)
@@ -3267,10 +3255,6 @@ class TestBotWithRequest:
                 user_id=chat_id, score=score, chat_id=game.chat_id, message_id=game.message_id
             )
 
-    @pytest.mark.xdist_group("game")
-    @xfail
-    async def test_set_game_score_4(self, bot, chat_id):
-        # NOTE: numbering of methods assures proper order between test_set_game_scoreX methods
         # Test force setting a lower score
         game_short_name = "test_game"
         game = await bot.send_game(chat_id, game_short_name)
@@ -3295,9 +3279,6 @@ class TestBotWithRequest:
         game2 = await bot.send_game(chat_id, game_short_name)
         assert str(score) in game2.game.text
 
-    @pytest.mark.xdist_group("game")
-    @xfail
-    async def test_get_game_high_scores(self, bot, chat_id):
         # We need a game to get the scores for
         game_short_name = "test_game"
         game = await bot.send_game(chat_id, game_short_name)