Fix up tests

meshtastic/tests/test_mesh_interface.py

@@ -6,7 +6,7 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
-from .. import mesh_pb2, BROADCAST_ADDR, LOCAL_ADDR
+from .. import mesh_pb2, config_pb2, BROADCAST_ADDR, LOCAL_ADDR
 from ..mesh_interface import MeshInterface
 from ..node import Node
 
@@ -36,12 +36,15 @@ def test_MeshInterface(capsys):
             "lastHeard": 1640204888,
         }
 
+
     iface.nodes = {NODE_ID: node}
     iface.nodesByNum = {NODE_NUM: node}
 
     myInfo = MagicMock()
     iface.myInfo = myInfo
 
+    iface.localNode.localConfig.lora.CopyFrom(config_pb2.Config.LoRaConfig())
+
     iface.showInfo()
     iface.localNode.showInfo()
     iface.showNodes()

meshtastic/tests/test_node.py

@@ -6,7 +6,7 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
-# from ..admin_pb2 import AdminMessage
+from .. import localonly_pb2, config_pb2
 from ..channel_pb2 import Channel # pylint: disable=E0611
 from ..node import Node
 from ..serial_interface import SerialInterface
@@ -19,21 +19,26 @@ from ..mesh_interface import MeshInterface
 # from ..util import Timeout
 
 
-# TODO
-# @pytest.mark.unit
-# def test_node(capsys):
-#    """Test that we can instantiate a Node"""
-#    anode = Node('foo', 'bar')
-#    radioConfig = RadioConfig()
-#    anode.radioConfig = radioConfig
-#    anode.showChannels()
-#    anode.showInfo()
-#    out, err = capsys.readouterr()
-#    assert re.search(r'Preferences', out)
-#    assert re.search(r'Channels', out)
-#    assert re.search(r'Primary channel URL', out)
-#    assert err == ''
-
+@pytest.mark.unit
+def test_node(capsys):
+    """Test that we can instantiate a Node"""
+    iface = MagicMock(autospec=SerialInterface)
+    with patch("meshtastic.serial_interface.SerialInterface", return_value=iface) as mo:
+        mo.localNode.getChannelByName.return_value = None
+        mo.myInfo.max_channels = 8
+        anode = Node(mo, "bar", noProto=True)
+        lc = localonly_pb2.LocalConfig()
+        anode.localConfig = lc
+        lc.lora.CopyFrom(config_pb2.Config.LoRaConfig())
+        anode.moduleConfig = localonly_pb2.LocalModuleConfig()
+        anode.showInfo()
+        out, err = capsys.readouterr()
+        assert re.search(r'Preferences', out)
+        assert re.search(r'Module preferences', out)
+        assert re.search(r'Channels', out)
+        assert re.search(r'Primary channel URL', out)
+        assert not re.search(r'remote node', out)
+        assert err == ''
 
 # TODO
 # @pytest.mark.unit

meshtastic/tests/test_serial_interface.py

@@ -6,6 +6,7 @@ from unittest.mock import mock_open, patch
 import pytest
 
 from ..serial_interface import SerialInterface
+from .. import config_pb2
 
 
 @pytest.mark.unit
@@ -20,6 +21,7 @@ def test_SerialInterface_single_port(
 ):
     """Test that we can instantiate a SerialInterface with a single port"""
     iface = SerialInterface(noProto=True)
+    iface.localNode.localConfig.lora.CopyFrom(config_pb2.Config.LoRaConfig())
     iface.showInfo()
     iface.localNode.showInfo()
     iface.close()

meshtastic/tests/test_tcp_interface.py

@@ -5,6 +5,7 @@ from unittest.mock import patch
 
 import pytest
 
+from .. import config_pb2
 from ..tcp_interface import TCPInterface
 
 
@@ -13,6 +14,7 @@ def test_TCPInterface(capsys):
     """Test that we can instantiate a TCPInterface"""
     with patch("socket.socket") as mock_socket:
         iface = TCPInterface(hostname="localhost", noProto=True)
+        iface.localNode.localConfig.lora.CopyFrom(config_pb2.Config.LoRaConfig())
         iface.myConnect()
         iface.showInfo()
         iface.localNode.showInfo()