Skip to content

Conversation

@ianmcorvidae
Copy link
Contributor

There's a couple other things in here as well -- fixing up the tests did find at least one actual bug.

Not super happy with how many of these I commented out, but it gets us back to a point where we can expect new PRs to maintain tests passing, which I think is valuable anyway.

Copy link
Contributor Author

@ianmcorvidae ianmcorvidae left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(a few of the not immediately test-related fixes noted here)

Comment on lines +163 to +164
if snake_name == "wifi_psk" and len(valStr) < 8:
print(f"Warning: network.wifi_psk must be 8 or more characters.")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This bit hadn't been updated for the new config format, so that's a bug fixed at least.

Comment on lines +641 to +645
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
)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had a test expecting to enforce this, but weren't doing so. So if channel index is passed along with a modem preset, we expect it to be 0 now.


# use id as dictionary key for correct json format in list of nodes
nodeid = n2["user"]["id"]
n2["user"].pop("id")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why we did this other than to clean up the display, but it meant if this got called and later something else needed the ID, it would fail.

@ianmcorvidae
Copy link
Contributor Author

(the failures now are about uploading to codecov. will try to look into that soon)

@thebentern thebentern merged commit ad02ce1 into meshtastic:master Mar 25, 2024
@ianmcorvidae ianmcorvidae deleted the make-tests-happy branch March 26, 2024 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants