Fix virtual device handling in tests

Author: ideoforms

isobar/io/midi/input.py

@@ -32,6 +32,21 @@ def __init__(self,
         """
         if device_name is None:
             device_name = os.getenv("ISOBAR_DEFAULT_MIDI_IN")
+
+        if device_name and not virtual:
+            #--------------------------------------------------------------------------------
+            # For permissive matching, look up device names that start with the given string.
+            #--------------------------------------------------------------------------------
+            available_device_names = mido.get_input_names()
+            matching_device_names = [name for name in available_device_names if device_name in name]
+
+            if len(matching_device_names) == 0:
+                raise DeviceNotFoundException("Could not find MIDI device with name starting with: %s" % device_name)
+            elif len(matching_device_names) > 1:
+                raise DeviceNotFoundException("Multiple MIDI output devices found matching '%s'" % (device_name))
+            else:
+                device_name = matching_device_names[0]
+
         try:
             self.midi = mido.open_input(name=device_name,
                                         callback=self._mido_callback,
@@ -360,4 +375,4 @@ def get_device_names(cls):
         midi_in.run()
     except KeyboardInterrupt:
         print("Exiting...")
-        midi_in.close()
+        midi_in.close()

isobar/io/midi/output.py

@@ -29,12 +29,12 @@ def __init__(self,
             if device_name is None:
                 device_name = os.getenv("ISOBAR_DEFAULT_MIDI_OUT")
 
-            if device_name:
+            if device_name and not virtual:
                 #--------------------------------------------------------------------------------
                 # For permissive matching, look up device names that start with the given string.
                 #--------------------------------------------------------------------------------
                 available_device_names = mido.get_output_names()
-                matching_device_names = [name for name in available_device_names if name.startswith(device_name)]
+                matching_device_names = [name for name in available_device_names if device_name in name]
 
                 if len(matching_device_names) == 0:
                     raise DeviceNotFoundException("Could not find MIDI device with name starting with: %s" % device_name)
@@ -135,4 +135,4 @@ def get_device_names(cls):
         """
         Returns a list of available MIDI output device names.
         """
-        return mido.get_output_names()
+        return mido.get_output_names()

tests/test_track_record.py

@@ -25,8 +25,8 @@ def test_track_recording_notes(dummy_timeline):
     input_device.note_on(60, 64)
 
     # Advance time to t=1
-    dummy_timeline.tick() # t=0 event processing
-    dummy_timeline.current_time += 1.0 # Simulate time passing
+    for n in range(dummy_timeline.ticks_per_beat):
+    	dummy_timeline.tick()
 
     # Send note off at t=1
     input_device.note_off(60)