Merge pull request #524 from ianmcorvidae/make-tests-happy

Fix up or comment out broken tests, to get CI (hopefully) happy

Author: thebentern

meshtastic/__init__.py

@@ -71,11 +71,11 @@ def onConnection(interface, topic=pub.AUTO_TOPIC): # called when we (re)connect
 from typing import *
 
 import google.protobuf.json_format
-import serial
-import timeago
-from dotmap import DotMap
+import serial # type: ignore[import-untyped]
+import timeago # type: ignore[import-untyped]
+from dotmap import DotMap # type: ignore[import-untyped]
 from google.protobuf.json_format import MessageToJson
-from pubsub import pub
+from pubsub import pub # type: ignore[import-untyped]
 from tabulate import tabulate
 
 from meshtastic import (
@@ -127,9 +127,9 @@ class KnownProtocol(NamedTuple):
     name: str
     # portnum: int, now a key
     # If set, will be called to prase as a protocol buffer
-    protobufFactory: Callable = None
+    protobufFactory: Optional[Callable] = None
     # If set, invoked as onReceive(interface, packet)
-    onReceive: Callable = None
+    onReceive: Optional[Callable] = None
 
 
 def _onTextReceive(iface, asDict):

meshtastic/__main__.py

@@ -160,8 +160,8 @@ def setPref(config, comp_name, valStr) -> bool:
     val = meshtastic.util.fromStr(valStr)
     logging.debug(f"valStr:{valStr} val:{val}")
 
-    if snake_name == "psk" and len(valStr) < 8:
-        print(f"Warning: wifi.psk must be 8 or more characters.")
+    if snake_name == "wifi_psk" and len(valStr) < 8:
+        print(f"Warning: network.wifi_psk must be 8 or more characters.")
         return False
 
     enumType = pref.enum_type
@@ -638,6 +638,11 @@ def onConnected(interface):
 
         def setSimpleConfig(modem_preset):
             """Set one of the simple modem_config"""
+            channelIndex = our_globals.get_channel_index()
+            if channelIndex is not None and channelIndex > 0:
+                meshtastic.util.our_exit(
+                    "Warning: Cannot set modem preset for non-primary channel", 1
+                )
             # Overwrite modem_preset
             prefs = interface.getNode(args.dest).localConfig
             prefs.lora.modem_preset = modem_preset

meshtastic/mesh_interface.py

@@ -129,7 +129,6 @@ def showInfo(self, file=sys.stdout):  # pylint: disable=W0613
 
                 # use id as dictionary key for correct json format in list of nodes
                 nodeid = n2["user"]["id"]
-                n2["user"].pop("id")
                 nodes[nodeid] = n2
         infos = owner + myinfo + metadata + mesh + json.dumps(nodes)
         print(infos)