remove: midi from test again and fix test

mhthies · Dec 4, 2024 · 102df11 · 102df11
1 parent 10e76f3
commit 102df11
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,8 +26,7 @@ jobs:
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install .$(python scripts/extract_dependencies.py --exclude doc dev)
-        pip uninstall python-rtmidi -y
+        pip install .$(python scripts/extract_dependencies.py --exclude doc dev midi)
     - name: Install and pack web ui assets
       run: |
         npm install
@@ -103,7 +102,6 @@ jobs:
         python -m pip install --upgrade pip
         mkdir _static
         pip install .$(python scripts/extract_dependencies.py --exclude test dev)
-
     - name: Build HTML docs with Sphinx
       run: |
         cd docs

diff --git a/test/interfaces/test_midi.py b/test/interfaces/test_midi.py
@@ -2,14 +2,14 @@
 import unittest
 import unittest.mock
 
-import mido
-import shc.interfaces.midi
-from shc.datatypes import RangeUInt8
-
 from .._helper import InterfaceThreadRunner
 
 
 try:
+    import mido
+    import shc.interfaces.midi
+    from shc.datatypes import RangeUInt8
+
     mido.backend.load()
     mido_backend_available = True
     mido_backend_error = ""
@@ -18,6 +18,7 @@
     mido_backend_error = str(e)
 
 
+@unittest.skipUnless(mido_backend_available, "mido MIDI backend is not available: {}".format(mido_backend_error))
 class MIDITest(unittest.TestCase):
     def test_errors(self) -> None:
         with self.assertRaises(ValueError):
@@ -31,7 +32,7 @@ def test_errors(self) -> None:
             interface.note_velocity(42)
 
 
-@unittest.skipUnless(mido_backend_available, "mido MIDI backend is not awailable: {}".format(mido_backend_error))
+@unittest.skipUnless(mido_backend_available, "mido MIDI backend is not available: {}".format(mido_backend_error))
 class MIDIInputTest(unittest.TestCase):
     def setUp(self) -> None:
         self.port_name = 'TestOutPort' + self.id().split('.')[-1]
@@ -137,7 +138,7 @@ def test_emulated_toggle(self) -> None:
             publish_mock.assert_called_once_with(False, unittest.mock.ANY)
 
 
-@unittest.skipUnless(mido_backend_available, "mido MIDI backend is not awailable: {}".format(mido_backend_error))
+@unittest.skipUnless(mido_backend_available, "mido MIDI backend is not available: {}".format(mido_backend_error))
 class MIDIOutputTest(unittest.TestCase):
     def setUp(self) -> None:
         self.port_name = 'TestInPort' + self.id().split('.')[-1]