refactor device lookup

Author: neuromusic

tests/test_devices.py

@@ -3,11 +3,18 @@
 from visual_behavior import devices
 
 
-@pytest.mark.parametrize("kwargs, expected", [
-    ({"in_val": "W7DTMJ19R2F", "input_type": "computer_name", }, "A1", ),
-    ({"in_val": "w7dtmj19r2f", "input_type": "computer_name", }, "A1", ),
-    ({"in_val": "A2", "input_type": "rig_id", }, "w7dtmj35y0t", ),
-    ({"in_val": "NOT_A_NAME", "input_type": "computer_name", }, "unknown", ),
+@pytest.mark.parametrize("computer_name, rig_id", [
+    ("W7DTMJ19R2F", "A1"),
+    ("w7dtmj19r2f", "A1"),
+    ("NOT_A_NAME", "unknown"),
 ])
-def test_get_rid_id(kwargs, expected):
-    assert devices.get_rig_id(**kwargs) == expected
+def test_get_rid_id(computer_name, rig_id):
+    assert devices.get_rig_id(computer_name) == rig_id
+
+    
+@pytest.mark.parametrize("rig_id, computer_name", [
+    ("A2","w7dtmj35y0t"),
+    ("NOT_A_RIG", "unknown"),
+])
+def test_get_computer_name(rig_id, computer_name):
+    assert devices.get_computer_name(rig_id) == computer_name