[WIP] Add more GUI tests

.github/workflows/test_pepys.yml

@@ -37,21 +37,21 @@ jobs:
         shell: bash -l {0}
         run: pip install pytest-github-actions-annotate-failures
 
-      - name: Run tests (non GUI)
-        shell: bash -l {0}
-        env:
-          PEPYS_SPATIALITE_PATH: /usr/lib/x86_64-linux-gnu/mod_spatialite.so
-          SQLALCHEMY_WARN_20: 1
-        run: |
-          coverage3 run -m pytest -v --color=yes --ignore=tests/gui_tests tests/ -Werror
+      # - name: Run tests (non GUI)
+      #   shell: bash -l {0}
+      #   env:
+      #     PEPYS_SPATIALITE_PATH: /usr/lib/x86_64-linux-gnu/mod_spatialite.so
+      #     SQLALCHEMY_WARN_20: 1
+      #   run: |
+      #     coverage3 run -m pytest -v --color=yes --ignore=tests/gui_tests tests/ -Werror
 
       - name: Run tests (GUI)
         shell: bash -l {0}
         env:
           PEPYS_SPATIALITE_PATH: /usr/lib/x86_64-linux-gnu/mod_spatialite.so
           SQLALCHEMY_WARN_20: 1
         run: |
-          coverage3 run -a -m pytest -v --color=yes -s tests/gui_tests -Werror
+          pytest tests/gui_tests/test_gui_interactively.py -s -vv
 
       - name: Run black
         shell: bash -l {0}

pepys_admin/maintenance/dialogs/progress_dialog.py

@@ -66,6 +66,7 @@ async def coroutine():
                         is_cancelled=self.is_cancelled,
                     ),
                 )
+                get_app().progress_bar_finished.fire()
                 self.future.set_result(result)
             except Exception as e:
                 try:

pepys_admin/maintenance/gui.py

@@ -29,6 +29,7 @@
 from prompt_toolkit.layout.menus import CompletionsMenu
 from prompt_toolkit.lexers.pygments import PygmentsLexer
 from prompt_toolkit.styles import Style
+from prompt_toolkit.utils import Event
 from prompt_toolkit.widgets.base import Border, Label
 from pygments.lexers.sql import SqlLexer
 from sqlalchemy.orm import joinedload, undefer
@@ -141,6 +142,8 @@ def __init__(self, data_store=None):
         )
 
         self.app.dropdown_opened = False
+        self.app.progress_bar_finished = Event(self.app)
+        self.app.preview_table_updated = Event(self.app)
 
     def init_ui_components(self):
         """Initialise all of the UI components, controls, containers and widgets"""
@@ -381,6 +384,7 @@ def filter_column_data(self, column_data):
     def run_query(self):
         """Runs the query as defined by the FilterWidget,
         and displays the result in the preview table."""
+        logger.debug("Running query")
         if self.current_table_object is None:
             return
 
@@ -460,6 +464,11 @@ def run_query(self):
         # the selected items label
         self.preview_table.current_values = []
         self.update_selected_items_label()
+        app.invalidate()
+
+        logger.debug("Firing preview updated")
+        logger.debug(f"{len(self.table_objects)=}")
+        self.app.preview_table_updated.fire()
 
     def get_table_data(self):
         return self.table_data
@@ -582,6 +591,7 @@ def on_filter_widget_change(self, value):
         widget is sensible about this and only raises this event if there has actually been
         a change in the output of the filters property. That means we can run a query
         each time this is called, and the query shouldn't get run more often than is needed."""
+        logger.debug("on filter widget change")
         # Convert the filter object to a SQL string to display in the Complete Query tab
         if value != []:
             filter_query = filter_widget_output_to_query(
@@ -742,7 +752,10 @@ async def coroutine():
         ensure_future(coroutine())
 
     def run_delete(self):
+        logger.debug("In run_delete")
+
         def do_delete(table_object, ids, set_percentage=None, is_cancelled=None):
+            logger.debug("In do delete")
             with self.data_store.session_scope():
                 change_id = self.data_store.add_to_changes(
                     USER, datetime.utcnow(), "Manual delete from Maintenance GUI"
@@ -753,6 +766,7 @@ def do_delete(table_object, ids, set_percentage=None, is_cancelled=None):
         def do_find_dependent_objects(
             table_object, selected_ids, set_percentage=None, is_cancelled=None
         ):
+            logger.debug("In do_find_dep_objs")
             with self.data_store.session_scope():
                 dependent_objects = self.data_store.find_dependent_objects(
                     table_object,
@@ -764,6 +778,7 @@ def do_find_dependent_objects(
             return dependent_objects
 
         async def coroutine():
+            logger.debug("In coroutine")
             entries = await self.get_all_selected_entries()
 
             if len(entries) == 0:
@@ -789,14 +804,14 @@ async def coroutine():
                 selected_items_text = f"{len(entries)} items selected"
 
             selected_ids = convert_objects_to_ids(entries, self.current_table_object)
-
+            logger.debug("Converted objects to IDs")
             dialog = ProgressDialog(
                 "Finding dependent items (may take a while)",
                 partial(do_find_dependent_objects, self.current_table_object, selected_ids),
                 show_cancel=True,
             )
             dependent_objects = await self.show_dialog_as_float(dialog)
-
+            logger.debug("Just awaited find dep objs progress dialog")
             if isinstance(dependent_objects, Exception):
                 await self.show_messagebox_async(
                     "Error",

pepys_admin/maintenance/widgets/filter_widget.py

@@ -15,6 +15,7 @@
 )
 
 CONTEXTUAL_HELP_STRING = "# Second panel: Build filters (F3)"
+from loguru import logger
 
 
 class FilterWidget:
@@ -104,6 +105,8 @@ def set_contextual_help(self, widget, text):
 
     def trigger_on_change(self, event=None):
         """Triggers the on_change_handler, if it is defined"""
+        logger.debug("trigger on change")
+        logger.debug(f"{self.filters=}")
         if self.on_change_handler is not None:
             if not list_deep_equals(self.filters, self.last_filters_output):
                 # Only call event there is a difference from last time we called
@@ -202,6 +205,7 @@ def filters(self):
 
         for entry_or_boolean in entries_and_booleans:
             strings = entry_or_boolean.get_string_values()
+            logger.debug(f"{strings=}")
             if strings[0] == self.column_prompt:
                 # The column dropdown is still at the default value
                 continue

pytest.ini

@@ -3,4 +3,5 @@ markers =
     postgres: marks tests as requiring a local postgres executable (deselect with '-m "not postgres"')
     automaton: marks tests as using the CLI automaton, which may take a while to run (deselect with '-m "not automaton"')
 filterwarnings =
-    error
+    error
+default_async_timeout = 120

requirements_dev.txt

@@ -17,4 +17,5 @@ isort
 pytest-benchmark
 pyte
 freezegun==1.*
-pexpect
+pexpect
+alt_pytest_asyncio