Make "test_full_workflow" a single test function (cf. textual#4998)

Author: PabloLec

pyproject.toml

@@ -73,7 +73,7 @@ recoverpy = "recoverpy.__init__:main"
 
 [tool.poetry.dependencies]
 python = "^3.8.1"
-textual = "0.79.1"
+textual = "0.80.0"
 
 [tool.poetry.dev-dependencies]
 coverage = "^7.6.1"

tests/integration/test_full_workflow.py

@@ -2,7 +2,6 @@
 from unittest.mock import MagicMock
 
 import pytest
-import pytest_asyncio
 
 from recoverpy import RecoverpyApp
 from tests.conftest import TEST_BLOCK_SIZE
@@ -23,30 +22,25 @@
 )
 
 
-@pytest.mark.asyncio(scope="class")
-@pytest.mark.incremental
-class TestFullWorkflow:
-    @pytest_asyncio.fixture(scope="class")
-    def session_patch(self, session_mocker):
-        session_mocker.patch(
-            "recoverpy.lib.env_check._is_user_root",
-            MagicMock(return_value=True),
-        )
-        session_mocker.patch(
-            "recoverpy.lib.env_check._are_system_dependencies_installed",
-            MagicMock(return_value=True),
-        )
-        session_mocker.patch(
-            "recoverpy.lib.env_check._is_linux",
-            MagicMock(return_value=True),
-        )
-
-    @pytest_asyncio.fixture(scope="class")
-    async def pilot(self, session_patch):
-        async with RecoverpyApp().run_test() as p:
-            yield p
-
-    async def test_init_app(self, pilot):
+@pytest.mark.asyncio
+async def test_full_workflow(session_mocker, tmp_path: Path):
+    # Apply patches
+    session_mocker.patch(
+        "recoverpy.lib.env_check._is_user_root",
+        MagicMock(return_value=True),
+    )
+    session_mocker.patch(
+        "recoverpy.lib.env_check._are_system_dependencies_installed",
+        MagicMock(return_value=True),
+    )
+    session_mocker.patch(
+        "recoverpy.lib.env_check._is_linux",
+        MagicMock(return_value=True),
+    )
+
+    # Launch the application
+    async with RecoverpyApp().run_test() as pilot:
+        # Test initialization of the app
         assert pilot.app is not None
         for screen in pilot.app.screens:
             assert pilot.app.is_screen_installed(pilot.app.screens[screen])
@@ -59,16 +53,15 @@ async def test_init_app(self, pilot):
         )
         assert pilot.app.screen._start_search_button.disabled is True
 
-    async def test_partition_list_default_state(self, pilot):
+        # Test partition list default state
         filter_checkbox = pilot.app.query("Checkbox").only_one()
         assert filter_checkbox is not None
         assert filter_checkbox.value is True
 
         items = list(pilot.app.query("ListItem").results())
         assert len(items) == VISIBLE_PARTITION_COUNT
 
-    async def test_partition_list_unfiltered(self, pilot):
-        filter_checkbox = pilot.app.query("Checkbox").only_one()
+        # Test partition list unfiltered
         filter_checkbox.toggle()
         await pilot.pause()
 
@@ -80,8 +73,7 @@ async def test_partition_list_unfiltered(self, pilot):
             len(list(pilot.app.query("ListItem").results())),
         )
 
-    async def test_partition_list_filtered(self, pilot):
-        filter_checkbox = pilot.app.query("Checkbox").only_one()
+        # Test partition list filtered
         filter_checkbox.toggle()
         await pilot.pause()
 
@@ -93,7 +85,7 @@ async def test_partition_list_filtered(self, pilot):
             len(list(pilot.app.query("ListItem").results())),
         )
 
-    async def test_input_search_params(self, pilot):
+        # Test input search parameters
         await pilot.click("#search-input")
         await pilot.pause()
 
@@ -109,7 +101,7 @@ async def test_input_search_params(self, pilot):
         assert pilot.app.screen._partition_list.highlighted_child.id == TEST_PARTITION
         assert pilot.app.screen._start_search_button.disabled is False
 
-    async def test_start_search(self, pilot):
+        # Test start search
         await pilot.click("#start-search-button")
         await pilot.pause()
 
@@ -121,7 +113,7 @@ async def test_start_search(self, pilot):
             == TEST_FULL_PARTITION
         )
 
-    async def test_search_results(self, pilot):
+        # Test search results
         await assert_with_timeout(
             lambda: int(pilot.app.screen.search_engine.search_progress.progress_percent)
             == 100,
@@ -147,7 +139,7 @@ async def test_search_results(self, pilot):
             len(list(pilot.app.query("ListItem").results())),
         )
 
-    async def test_select_search_results(self, pilot):
+        # Test select search results
         list_items = list(pilot.app.query("ListItem").results())
 
         for item in list_items:
@@ -157,7 +149,7 @@ async def test_select_search_results(self, pilot):
             assert item.highlighted is True
             assert pilot.app.screen._get_selected_grep_result().list_item == item
 
-    async def test_open_result(self, pilot):
+        # Test open result
         select_item = pilot.app.screen._grep_result_list.highlighted_child
         assert select_item is not None
         select_grep_result = pilot.app.screen._get_selected_grep_result()
@@ -172,7 +164,7 @@ async def test_open_result(self, pilot):
         assert pilot.app.screen._block_size == TEST_BLOCK_SIZE
         assert pilot.app.screen._inode == select_grep_result.inode
 
-    async def test_result_content(self, pilot):
+        # Test result content
         await pilot.pause()
 
         assert (
@@ -184,7 +176,7 @@ async def test_result_content(self, pilot):
             pilot.app.screen._inode
         ) == get_block_content_text(pilot.app.screen._block_content)
 
-    async def test_select_first_result(self, pilot):
+        # Test select first result
         await pilot.click("#add-block-button")
         await pilot.pause()
 
@@ -200,7 +192,7 @@ async def test_select_first_result(self, pilot):
         assert len(pilot.app.screen._saver._results) == 1
         add_expected_save_result(pilot)
 
-    async def test_select_next_result(self, pilot):
+        # Test select next result
         current_inode = pilot.app.screen._inode
         await pilot.click("#next-button")
         await pilot.pause()
@@ -225,10 +217,12 @@ async def test_select_next_result(self, pilot):
         await assert_current_result_is_selected_for_save(pilot)
 
         await pilot.click("#add-block-button")
+        await pilot.pause()
+
         assert len(pilot.app.screen._saver._results) == 2
         add_expected_save_result(pilot)
 
-    async def test_select_previous_result(self, pilot):
+        # Test select previous result
         previous_button = pilot.app.query("#previous-button").only_one()
         current_inode = pilot.app.screen._inode
         await pilot.click("#previous-button")
@@ -271,13 +265,13 @@ async def test_select_previous_result(self, pilot):
         assert len(pilot.app.screen._saver._results) == 3
         add_expected_save_result(pilot)
 
-    async def test_start_save_process(self, pilot):
+        # Test start save process
         await pilot.click("#save-button")
         await pilot.pause()
 
         assert pilot.app.screen.name == "save"
 
-    async def test_edit_save_path(self, pilot, tmp_path: Path):
+        # Test edit save path
         await pilot.click("#edit-save-path-button")
         await pilot.pause()
 
@@ -298,7 +292,7 @@ async def test_edit_save_path(self, pilot, tmp_path: Path):
         assert pilot.app.screen.name == "save"
         assert pilot.app.screen._saver.save_path == tmp_path
 
-    async def test_save_results(self, pilot):
+        # Test save results
         await pilot.click("#save-button")
         await pilot.pause()
 
@@ -309,7 +303,7 @@ async def test_save_results(self, pilot):
 
         assert pilot.app.screen.name == "result"
 
-    def check_saved_result(self, tmp_path: Path):
+        # Check saved result
         dir_files = list(tmp_path.iterdir())
         assert len(dir_files) == 1
         assert dir_files[0].name.startswith("recoverpy-save-")