Skip to content
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

Jump to bottom

improve logging test and increase coverage on server.py #1743

Merged
merged 24 commits into from Nov 2, 2022
Merged

improve logging test and increase coverage on server.py #1743

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
adbc9b6
improve uds logging test and increase coverage
iudeen Oct 29, 2022
872d5dd
add skip for win32
iudeen Oct 29, 2022
08059cf
Add Client to test
iudeen Oct 29, 2022
0dfa766
remove fixture
iudeen Oct 29, 2022
edb53e5
improve uds logging test and increase coverage
iudeen Oct 29, 2022
efc399e
add skip for win32
iudeen Oct 29, 2022
74d7022
Add Client to test
iudeen Oct 29, 2022
87c8b62
remove fixture
iudeen Oct 29, 2022
d7c0fbb
Remove pragma on fd
Kludex Oct 31, 2022
1b4f770
Fix coverage
Kludex Oct 31, 2022
f147004
Merge branch 'fix/improve-cov-server' of https://github.com/iudeen/uv…
iudeen Oct 31, 2022
f0916ac
remove pragma
iudeen Oct 31, 2022
ad4ae14
add test for `fd` param
iudeen Oct 31, 2022
bd7553f
skip win32
iudeen Oct 31, 2022
3631f70
Add tests for cases when port is `0`
iudeen Nov 1, 2022
833aef0
Merge remote-tracking branch 'origin/master' into fix/improve-cov-server
iudeen Nov 1, 2022
8804d7e
improve coverage on start up conditions
iudeen Nov 1, 2022
8ac01a6
Merge branch 'encode:master' into fix/improve-cov-server
iudeen Nov 1, 2022
2b0774c
Merge branch 'fix/improve-cov-server' of https://github.com/iudeen/uv…
iudeen Nov 1, 2022
588dbd4
increase coverage threshold
iudeen Nov 1, 2022
73b5367
Remove unwanted params from test and simply
iudeen Nov 2, 2022
1ca64ae
revert: remove port zero test
iudeen Nov 2, 2022
aa5bc0e
revert: remove tests in test_main.py
iudeen Nov 2, 2022
5729216
update coverage fail_under
iudeen Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions uvicorn/server.py
View file
Open in desktop
Expand Up @@ -120,7 +120,7 @@ def _share_socket(sock: socket.SocketType) -> socket.SocketType:
self.servers.append(server)
listeners = sockets

elif config.fd is not None:
elif config.fd is not None: # pragma: py-win32
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Add # pragma: py-win32 because we use socket.AF_UNIX in all instances.

Copy link
Sponsor Member

Choose a reason for hiding this comment

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

Ah, you mean in the line after... Got it. Yep!

# Use an existing socket, from a file descriptor.
sock = socket.fromfd(config.fd, socket.AF_UNIX, socket.SOCK_STREAM)
server = await loop.create_server(
Expand All @@ -130,7 +130,7 @@ def _share_socket(sock: socket.SocketType) -> socket.SocketType:
listeners = server.sockets
self.servers = [server]

elif config.uds is not None:
elif config.uds is not None: # pragma: py-win32
# Create a socket using UNIX domain socket.
uds_perms = 0o666
if os.path.exists(config.uds):
Expand Down