Skip to content

Avoid Internet version checks when displaying local radio information #996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
the8thbit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid Internet version checks when displaying local radio information #996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions meshtastic/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,12 +1081,6 @@ def setSimpleConfig(modem_preset):
interface.getNode(args.dest, **getNode_kwargs).showInfo()
closeNow = True
print("")
pypi_version = meshtastic.util.check_if_newer_version()
if pypi_version:
print(
f"*** A newer version v{pypi_version} is available!"
' Consider running "pip install --upgrade meshtastic" ***\n'
)
else:
print("Showing info of remote node is not supported.")
print(
Expand Down
28 changes: 28 additions & 0 deletions meshtastic/tests/test_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,34 @@ def mock_showInfo():
mo.assert_called()


@pytest.mark.unit
@pytest.mark.usefixtures("reset_mt_config")
@pytest.mark.parametrize("connection_args,interface_class", [
([], "meshtastic.serial_interface.SerialInterface"),
(["--host", "meshtastic.local"], "meshtastic.tcp_interface.TCPInterface"),
])
def test_main_info_without_internet(connection_args, interface_class, monkeypatch, capsys):
"""Local radio information must not make an Internet request."""
monkeypatch.setattr(sys, "argv", ["", "--info", *connection_args])
iface = MagicMock()
iface.showInfo.side_effect = lambda: print("Radio information")
iface.getNode.return_value.showInfo.side_effect = lambda: print("Node configuration")

with patch(interface_class, return_value=iface), patch(
"meshtastic.util.requests.get"
) as request:
main()

request.assert_not_called()
iface.showInfo.assert_called_once_with()
iface.getNode.return_value.showInfo.assert_called_once_with()
iface.close.assert_called()
out, err = capsys.readouterr()
assert "Radio information" in out
assert "Node configuration" in out
assert err == ""


@pytest.mark.unit
@pytest.mark.usefixtures("reset_mt_config")
@patch("os.getlogin")
Expand Down