Skip to content

Commit

Permalink
undo test changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ReimarBauer committed Nov 13, 2023
1 parent e562a18 commit 2e0396c
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 9 deletions.
2 changes: 0 additions & 2 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ def _load_module(module_name, path):
_load_module("mscolab_settings", path)


'''
@pytest.fixture(autouse=True)
def fail_if_open_message_boxes_left():
"""Fail a test if there are any Qt message boxes left open at the end
Expand All @@ -243,7 +242,6 @@ def fail_if_open_message_boxes_left():
# Some objects deny permission, pass in that case
except RuntimeError:
pass
'''

@pytest.fixture(scope="session", autouse=True)
def configure_testsetup(request):
Expand Down
3 changes: 1 addition & 2 deletions tests/_test_msui/test_mscolab.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
from tests.constants import MSUI_CONFIG_PATH
from mslib.mscolab.seed import add_user, get_user, add_operation, add_user_to_operation

PORTS = list(range(18000, 18500))
PORTS = list(range(25000, 25500))


class Test_Mscolab_connect_window():
Expand Down Expand Up @@ -700,7 +700,6 @@ def test_delete_operation_from_list(self, mockbox):
self.window.mscolab.delete_operation_from_list(op_id)
assert self.window.mscolab.active_op_id is None

@pytest.mark.skip(reason="needs review for py311")
@mock.patch("PyQt5.QtWidgets.QMessageBox.question", return_value=QtWidgets.QMessageBox.Yes)
def test_user_delete(self, mockmessage):
self._connect_to_mscolab()
Expand Down
2 changes: 0 additions & 2 deletions tests/_test_msui/test_mss.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,11 @@
limitations under the License.
"""

import pytest
import sys
from PyQt5 import QtWidgets, QtTest, QtCore
from mslib.msui import mss


@pytest.mark.skip(reason="needs review for py311")
def test_mss_rename_message():
application = QtWidgets.QApplication(sys.argv)
main_window = mss.MSSMainWindow()
Expand Down
1 change: 0 additions & 1 deletion tests/_test_msui/test_msui.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ def teardown_method(self):
self.application.quit()
QtWidgets.QApplication.processEvents()

@pytest.mark.skip(reason="needs review for py311")
def test_no_updater(self):
assert not hasattr(self.window, "updater")

Expand Down
2 changes: 0 additions & 2 deletions tests/_test_utils/test_airdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"""
import os
import mock
import pytest
from PyQt5 import QtWidgets
from mslib.utils.airdata import download_progress, get_airports, \
get_available_airspaces, update_airspace, get_airspaces
Expand Down Expand Up @@ -161,7 +160,6 @@ def test_get_airspaces_no_data(mockbox):
assert airspaces == []


@pytest.mark.skip(reason="needs review for py311")
@mock.patch("mslib.utils.airdata.download_progress", _download_progress_airspace)
@mock.patch("PyQt5.QtWidgets.QMessageBox.question", return_value=QtWidgets.QMessageBox.Yes)
def test_get_airspaces(mockbox):
Expand Down

0 comments on commit 2e0396c

Please sign in to comment.