-
-
Notifications
You must be signed in to change notification settings - Fork 718
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.
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
Fix worker dashboard proxy #8528
Fix worker dashboard proxy #8528
Conversation
Unit Test ResultsSee test report for an extended history of previous test failures. This is useful for diagnosing flaky tests. 27 files ± 0 27 suites ±0 10h 27m 51s ⏱️ + 30m 37s For more details on these failures, see this check. Results for commit 04c5415. ± Comparison against base commit 54ed6a1. ♻️ This comment has been updated with latest results. |
Is there a way for us to test these changes? |
Attempted in 4ad2bba but appears just having jupyter-server-proxy installed is causing almost every test to timeout. Will poke at it a bit more. |
73acdd2
to
6e23fb3
Compare
6e23fb3
to
389eb1e
Compare
@@ -41,6 +53,8 @@ async def http_get(self, port, host, proxied_path): | |||
return await self.proxy(port, proxied_path) | |||
|
|||
async def open(self, port, host, proxied_path): | |||
if host not in self.host_allowlist: | |||
self.host_allowlist.append(host) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be tested as well? (same for the change in lines 41-42)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure how to do this w/o some obvious mocking/assert calls as all our tests are ran on the same host, but okay. I'll look at that as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, small adjustment to a test to verify that bit of code. Note that exactly none of GlobalProxyHandler
is directly tested but thru integration type testing so followed suit there. The test (test_dashboard_non_standard_ports
) will fail now w/o GlobalProxyHandler updating host_allowlist
. f9cd3dc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! 🚀
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like this is still not tested, but given that testing appears to be tricky, I consider this non-blocking.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ya, the second one there, is only hit on a websocket connection unfortunately.
Windows seems like a hard one to please for the jupyter tests:
And similar issue with |
…ix-proxy-to-worker-dashboard
…ix-proxy-to-worker-dashboard
Okay @hendrikmakait, sorry for dragging this out. Think it's ready for another gander. Failures are unrelated, (mostly #8561) |
…ix-proxy-to-worker-dashboard
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, @milesgranger!
@@ -41,6 +53,8 @@ async def http_get(self, port, host, proxied_path): | |||
return await self.proxy(port, proxied_path) | |||
|
|||
async def open(self, port, host, proxied_path): | |||
if host not in self.host_allowlist: | |||
self.host_allowlist.append(host) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like this is still not tested, but given that testing appears to be tricky, I consider this non-blocking.
Co-authored-by: Hendrik Makait <hendrik@makait.com>
cc502f1
to
dda3786
Compare
dda3786
to
04c5415
Compare
a9b764b
to
04c5415
Compare
There seems to be a flaky test now:
If it's okay with you, @hendrikmakait, can we merge this and I sort that out in a follow-up tomorrow? |
Works for me, could you add an issue for that and assign it to yourself? |
Closes #8335
xref jupyter-server/jupyter_server#1012
pre-commit run --all-files