Move bad port tests to non-integration, use mocker instead of relying on

port number to fail the test

tests/test_ctrls_connection.py

@@ -1,8 +1,25 @@
 from flightgear_python.fg_if import CtrlsConnection
+from flightgear_python.fg_util import FGConnectionError
+from testing_common import supported_ctrls_versions
 
 import pytest
 
 
 def test_ctrls_wrong_version_on_create():
     with pytest.raises(NotImplementedError):
         CtrlsConnection(ctrls_version=1)
+
+
+@pytest.mark.parametrize('ctrls_version', supported_ctrls_versions)
+def test_ctrls_bad_port(mocker, ctrls_version):
+    def mock_bind(addr):
+        # Binding to port 1 should usually fail with Should fail with `[Errno 13] Permission denied`
+        # but this is more reliable
+        raise PermissionError('Mock permission fail')
+
+    mocker.patch('socket.socket.bind', mock_bind)
+
+    ctrls_c = CtrlsConnection(ctrls_version)
+    with pytest.raises(FGConnectionError):
+        # Should fail with [Errno 13] Permission denied
+        ctrls_c.connect_rx('localhost', 1, lambda data, pipe: data)

tests/test_fdm_connection.py

@@ -1,4 +1,5 @@
 from flightgear_python.fg_if import FDMConnection
+from flightgear_python.fg_util import FGConnectionError
 from testing_common import supported_fdm_versions
 
 import pytest
@@ -95,3 +96,17 @@ def rx_cb(fdm_data, event_pipe):
 def test_fdm_wrong_version_on_create():
     with pytest.raises(NotImplementedError):
         FDMConnection(fdm_version=1)
+
+
+@pytest.mark.parametrize('fdm_version', supported_fdm_versions)
+def test_fdm_bad_port(mocker, fdm_version):
+    def mock_bind(addr):
+        # Binding to port 1 should usually fail with Should fail with `[Errno 13] Permission denied`
+        # but this is more reliable
+        raise PermissionError('Mock permission fail')
+
+    mocker.patch('socket.socket.bind', mock_bind)
+
+    fdm_c = FDMConnection(fdm_version)
+    with pytest.raises(FGConnectionError):
+        fdm_c.connect_rx('localhost', 1, lambda data, pipe: data)

tests/test_gui_connection.py

@@ -1,8 +1,25 @@
 from flightgear_python.fg_if import GuiConnection
+from flightgear_python.fg_util import FGConnectionError
+from testing_common import supported_gui_versions
 
 import pytest
 
 
 def test_gui_wrong_version_on_create():
     with pytest.raises(NotImplementedError):
         GuiConnection(gui_version=1)
+
+
+@pytest.mark.parametrize('gui_version', supported_gui_versions)
+def test_gui_bad_port(mocker, gui_version):
+    def mock_bind(addr):
+        # Binding to port 1 should usually fail with Should fail with `[Errno 13] Permission denied`
+        # but this is more reliable
+        raise PermissionError('Mock permission fail')
+
+    mocker.patch('socket.socket.bind', mock_bind)
+
+    gui_c = GuiConnection(gui_version)
+    with pytest.raises(FGConnectionError):
+        # Should fail with [Errno 13] Permission denied
+        gui_c.connect_rx('localhost', 1, lambda data, pipe: data)

tests/test_integration_FG_Ctrls.py

@@ -1,7 +1,6 @@
 import pytest
 
 from flightgear_python.fg_if import CtrlsConnection
-from flightgear_python.fg_util import FGConnectionError
 
 
 pytestmark = pytest.mark.fg_integration
@@ -35,9 +34,3 @@ def rx_cb(ctrls_data, event_pipe):
     # Prevent 'ResourceWarning: unclosed' warning
     ctrls_c.fg_rx_sock.close()
     ctrls_c.fg_tx_sock.close()
-
-
-def test_ctrls_wrong_port():
-    ctrls_c = CtrlsConnection(ctrls_version)
-    # with pytest.raises(FGConnectionError):
-    ctrls_c.connect_rx('localhost', 123, lambda data, pipe: data)

tests/test_integration_FG_FDM.py

@@ -1,7 +1,7 @@
 import pytest
 
 from flightgear_python.fg_if import FDMConnection
-from flightgear_python.fg_util import FGConnectionError, FGCommunicationError
+from flightgear_python.fg_util import FGCommunicationError
 
 from testing_common import supported_fdm_versions
 
@@ -39,12 +39,6 @@ def rx_cb(fdm_data, event_pipe):
     fdm_c.fg_tx_sock.close()
 
 
-def test_fdm_wrong_port():
-    fdm_c = FDMConnection(fdm_version)
-    # with pytest.raises(FGConnectionError):
-    fdm_c.connect_rx('localhost', 123, lambda data, pipe: data)
-
-
 def test_fdm_wrong_version_in_stream():
     fdm_version_supported_but_not_downloaded = fdm_version + 1
     assert fdm_version_supported_but_not_downloaded in supported_fdm_versions

tests/test_integration_FG_Gui.py

@@ -1,7 +1,6 @@
 import pytest
 
 from flightgear_python.fg_if import GuiConnection
-from flightgear_python.fg_util import FGConnectionError
 
 
 pytestmark = pytest.mark.fg_integration
@@ -35,9 +34,3 @@ def rx_cb(gui_data, event_pipe):
     # Prevent 'ResourceWarning: unclosed' warning
     gui_c.fg_rx_sock.close()
     gui_c.fg_tx_sock.close()
-
-
-def test_gui_wrong_port():
-    gui_c = GuiConnection(gui_version)
-    # with pytest.raises(FGConnectionError):
-    gui_c.connect_rx('localhost', 123, lambda data, pipe: data)