berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into uring03

This commit is contained in:
Rob Ede 2022-03-08 22:14:06 +00:00 committed by GitHub
parent 99255df537 c5d6174cec
commit e184e318ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actix-server/examples/tcp-echo.rs
View File

@ -23,6 +23,7 @@ use actix_service::{fn_service, ServiceFactoryExt as _};
use bytes::BytesMut; use bytes::BytesMut;
use futures_util::future::ok; use futures_util::future::ok;
use tokio::io::{AsyncReadExt as _, AsyncWriteExt as _}; use tokio::io::{AsyncReadExt as _, AsyncWriteExt as _};
use tracing::{error, info};
async fn run() -> io::Result<()> { async fn run() -> io::Result<()> {
tracing_subscriber::fmt::init(); tracing_subscriber::fmt::init();

1
actix-server/tests/server.rs
View File

@ -254,6 +254,7 @@ async fn test_max_concurrent_connections() {
h.join().unwrap().unwrap(); h.join().unwrap().unwrap();
} }
// TODO: race-y failures detected due to integer underflow when calling Counter::total
#[actix_rt::test] #[actix_rt::test]
async fn test_service_restart() { async fn test_service_restart() {
use std::task::{Context, Poll}; use std::task::{Context, Poll};