From 9f12de6bd13e3b2cc21e124b0f2c1731f6315388 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom Date: Thu, 5 Sep 2024 11:33:46 -0400 Subject: [PATCH] drop gui testing --- .github/workflows/industrial_ci_action.yml | 9 ++------- src/surface/gui/package.xml | 5 ----- src/surface/gui/setup.py | 2 +- src/surface/gui/test/test_app.py | 9 --------- src/surface/gui/test/test_operator_app.py | 9 --------- src/surface/gui/test/test_pilot_app.py | 9 --------- 6 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 src/surface/gui/test/test_app.py delete mode 100644 src/surface/gui/test/test_operator_app.py delete mode 100644 src/surface/gui/test/test_pilot_app.py diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index a2a4ddf2..d1c60e48 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -41,12 +41,7 @@ jobs: env: # either pass all entries explicitly DOCKER_IMAGE: ghcr.io/cwrubotix/rov-25:${{matrix.ROS_DISTRO}} ROS_DISTRO: ${{ matrix.ROS_DISTRO }} - # Done to avoid permssion errors in the ros-industrial ci. - # DOCKER_RUN_OPTS: -u root ROS_REPO: ${{ matrix.ROS_REPO }} - # # Allows pip packages in Python3.11+ - # PIP_BREAK_SYSTEM_PACKAGES: 1 # upgrade rosdep to 0.25 - BEFORE_INSTALL_TARGET_DEPENDENCIES_EMBED: 'sudo apt upgrade -y && export PIP_BREAK_SYSTEM_PACKAGES=1' - # # Create config file to allow pip packacages in Python3.11+ - # BEFORE_INSTALL_TARGET_DEPENDENCIES_EMBED: 'printf "[install]\nbreak-system-packages = true\n" | sudo tee -a /etc/pip.conf' + BEFORE_INSTALL_TARGET_DEPENDENCIES_EMBED: 'sudo apt upgrade -y && ls' + \ No newline at end of file diff --git a/src/surface/gui/package.xml b/src/surface/gui/package.xml index 6474b8ce..443ab566 100644 --- a/src/surface/gui/package.xml +++ b/src/surface/gui/package.xml @@ -11,11 +11,6 @@ python3-pre-commit python3-pytest - - xvfb - python3-pytest-xvfb - python-pytest-qt-pip - rov_msgs python3-numpy cv_bridge diff --git a/src/surface/gui/setup.py b/src/surface/gui/setup.py index a37e5613..46a75c5f 100644 --- a/src/surface/gui/setup.py +++ b/src/surface/gui/setup.py @@ -46,7 +46,7 @@ maintainer_email='bwp18@case.edu', description='MATE ROV GUI and related ROS nodes', license='Apache License 2.0', - tests_require=['pytest', 'pytest-qt', 'pytest-xvfb'], + tests_require=['pytest'], entry_points={ 'console_scripts': [ 'run_pilot = gui.pilot_app:run_gui_pilot', diff --git a/src/surface/gui/test/test_app.py b/src/surface/gui/test/test_app.py deleted file mode 100644 index f34a695d..00000000 --- a/src/surface/gui/test/test_app.py +++ /dev/null @@ -1,9 +0,0 @@ -from gui.app import App -from pytestqt.qtbot import QtBot - - -def test_app_instantiation(qtbot: QtBot) -> None: - """Unit test for App instantiation.""" - app = App('test') - app.show() - qtbot.addWidget(app) diff --git a/src/surface/gui/test/test_operator_app.py b/src/surface/gui/test/test_operator_app.py deleted file mode 100644 index c6fe4a93..00000000 --- a/src/surface/gui/test/test_operator_app.py +++ /dev/null @@ -1,9 +0,0 @@ -from gui.operator_app import OperatorApp -from pytestqt.qtbot import QtBot - - -def test_app_instantiation(qtbot: QtBot) -> None: - """Unit test for OperatorApp instantiation.""" - app = OperatorApp() - app.show() - qtbot.addWidget(app) diff --git a/src/surface/gui/test/test_pilot_app.py b/src/surface/gui/test/test_pilot_app.py deleted file mode 100644 index bb82ede0..00000000 --- a/src/surface/gui/test/test_pilot_app.py +++ /dev/null @@ -1,9 +0,0 @@ -from gui.pilot_app import PilotApp -from pytestqt.qtbot import QtBot - - -def test_app_instantiation(qtbot: QtBot) -> None: - """Unit test for PilotApp instantiation.""" - app = PilotApp() - app.show() - qtbot.addWidget(app)