Fix socketcan KeyError (#1599)

* use get

* adapt test for issue #1598

Author: zariiii9003

can/interfaces/socketcan/utils.py

@@ -66,7 +66,7 @@ def find_available_interfaces() -> List[str]:
         output_json,
     )
 
-    interfaces = [i["ifname"] for i in output_json if i["link_type"] == "can"]
+    interfaces = [i["ifname"] for i in output_json if i.get("link_type") == "can"]
     return interfaces
 
 

test/data/ip_link_list.json

@@ -0,0 +1,91 @@
+[
+    {
+        "ifindex": 1,
+        "ifname": "lo",
+        "flags": [
+            "LOOPBACK",
+            "UP",
+            "LOWER_UP"
+        ],
+        "mtu": 65536,
+        "qdisc": "noqueue",
+        "operstate": "UNKNOWN",
+        "linkmode": "DEFAULT",
+        "group": "default",
+        "txqlen": 1000,
+        "link_type": "loopback",
+        "address": "00:00:00:00:00:00",
+        "broadcast": "00:00:00:00:00:00"
+    },
+    {
+        "ifindex": 2,
+        "ifname": "eth0",
+        "flags": [
+            "NO-CARRIER",
+            "BROADCAST",
+            "MULTICAST",
+            "UP"
+        ],
+        "mtu": 1500,
+        "qdisc": "fq_codel",
+        "operstate": "DOWN",
+        "linkmode": "DEFAULT",
+        "group": "default",
+        "txqlen": 1000,
+        "link_type": "ether",
+        "address": "11:22:33:44:55:66",
+        "broadcast": "ff:ff:ff:ff:ff:ff"
+    },
+    {
+        "ifindex": 3,
+        "ifname": "wlan0",
+        "flags": [
+            "BROADCAST",
+            "MULTICAST",
+            "UP",
+            "LOWER_UP"
+        ],
+        "mtu": 1500,
+        "qdisc": "noqueue",
+        "operstate": "UP",
+        "linkmode": "DORMANT",
+        "group": "default",
+        "txqlen": 1000,
+        "link_type": "ether",
+        "address": "11:22:33:44:55:66",
+        "broadcast": "ff:ff:ff:ff:ff:ff"
+    },
+    {
+        "ifindex": 48,
+        "ifname": "vcan0",
+        "flags": [
+            "NOARP",
+            "UP",
+            "LOWER_UP"
+        ],
+        "mtu": 72,
+        "qdisc": "noqueue",
+        "operstate": "UNKNOWN",
+        "linkmode": "DEFAULT",
+        "group": "default",
+        "txqlen": 1000,
+        "link_type": "can"
+    },
+    {
+        "ifindex": 50,
+        "ifname": "mycustomCan123",
+        "flags": [
+            "NOARP",
+            "UP",
+            "LOWER_UP"
+        ],
+        "mtu": 72,
+        "qdisc": "noqueue",
+        "operstate": "UNKNOWN",
+        "linkmode": "DEFAULT",
+        "group": "default",
+        "txqlen": 1000,
+        "link_type": "can"
+    },
+    {}
+]

test/test_socketcan_helpers.py

@@ -4,9 +4,8 @@
 Tests helpers in `can.interfaces.socketcan.socketcan_common`.
 """
 
-import gzip
 import unittest
-from base64 import b64decode
+from pathlib import Path
 from unittest import mock
 
 from can.interfaces.socketcan.utils import error_code_to_str, find_available_interfaces
@@ -42,17 +41,7 @@ def test_find_available_interfaces(self):
 
     def test_find_available_interfaces_w_patch(self):
         # Contains lo, eth0, wlan0, vcan0, mycustomCan123
-        ip_output_gz_b64 = (
-            "H4sIAAAAAAAAA+2UzW+CMBjG7/wVhrNL+BC29IboEqNSwzQejDEViiMC5aNsmmX/+wpZTGUwDAcP"
-            "y5qmh+d5++bN80u7EXpsfZRnsUTf8yMXn0TQk/u8GqEQM1EMiMjpXoAOGZM3F6mUZxAuhoY55UpL"
-            "fbWoKjO4Hts7pl/kLdc+pDlrrmuaqnNq4vqZU8wSkSTHOeYHIjFOM4poOevKmlpwbfF+4EfHkLil"
-            "PRo/G6vZkrcPKcnjwnOxh/KA8h49JQGOimAkSaq03NFz/B0PiffIOfIXkeumOCtiEiUJXG++bp8S"
-            "5Dooo/WVZeFnvxmYUgsM01fpBmQWfDAN256M7SqioQ2NkWm8LKvGnIU3qTN+xylrV/FdaHrJzmFk"
-            "gkacozuzZMnhtAGkLANFAaoKBgOgaUDXG0F6Hrje7SDVWpDvAYpuIdmJV4dn2cSx9VUuGiFCe25Y"
-            "fwTi4KmW4ptzG0ULGvYPLN1APSqdMN3/82TRtOeqSbW5hmcnzygJTRTJivofcEvAgrAVvgD8aLkv"
-            "/AcAAA=="
-        )
-        ip_output = gzip.decompress(b64decode(ip_output_gz_b64)).decode("ascii")
+        ip_output = (Path(__file__).parent / "data" / "ip_link_list.json").read_text()
 
         with mock.patch("subprocess.check_output") as check_output:
             check_output.return_value = ip_output