console-conf: fix crash on network info #1218
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mwhudson
requested changes
Mar 14, 2022
dbungert
force-pushed
the
console-conf-await-str
branch
from
867967c
to
2c929e2
Compare
mwhudson
reviewed
Mar 14, 2022
There was a problem hiding this comment.
Looks like we need this as well:
diff --git a/subiquity/server/controllers/network.py b/subiquity/server/controllers/network.py
index 48c432e6c..6a3d3196c 100644
--- a/subiquity/server/controllers/network.py
+++ b/subiquity/server/controllers/network.py
@@ -405,4 +405,4 @@ class NetworkController(BaseNetworkController, SubiquityController):
self.delete_link(dev_name)
async def info_GET(self, dev_name: str) -> str:
- return self.get_info_for_netdev(dev_name)
+ return await self.get_info_for_netdev(dev_name)
If you run dryrun for console-conf, go to the network page, go to an interface, then info, a crash of the form TypeError: object str can't be used in 'await' expression can be seen. The signature for the core version of get_info_for_netdev is not async, but a non-async method returning str. So mark the core version of the function async. Co-authored-by: Michael Hudson-Doyle <michael.hudson@canonical.com>
dbungert
force-pushed
the
console-conf-await-str
branch
from
2c929e2
to
4b1277a
Compare
mwhudson
approved these changes
Mar 14, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If you run dryrun for console-conf, go to the network page, go to an
interface, then info, a crash of the form
TypeError: object str can't be used in 'await' expression
can be seen. The signature for the core version of get_info_for_netdev
is not async, but a non-async method returning str.
So skip the loading dialog, which wants the awaitable.