mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-04 21:37:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update tests

Browse source
This commit is contained in:
Nikolay Kim 2022-11-25 01:07:25 +01:00
parent 427e78d385
commit f731a7800d
13 changed files with 46 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ntex-bytes/src/buf/uninit_slice.rs
View file

@ -105,7 +105,7 @@ impl UninitSlice {
/// Return a raw pointer to the slice's buffer.
///
/// # Safety
/// // Safety
///
/// The caller **must not** read from the referenced memory and **must not**
/// write **uninitialized** bytes to the slice either.

2
ntex-connect/Cargo.toml
View file

@ -57,5 +57,5 @@ webpki-roots = { version = "0.22", optional = true }
[dev-dependencies]
rand = "0.8"
env_logger = "0.9"
env_logger = "0.10"
ntex = { version = "0.5", features = ["tokio"] }

2
ntex-io/Cargo.toml
View file

@ -27,6 +27,6 @@ pin-project-lite = "0.2"
[dev-dependencies]
rand = "0.8"
env_logger = "0.9"
env_logger = "0.10"
ntex = { version = "0.5", features = ["tokio"] }

2
ntex-macros/Cargo.toml
View file

@ -18,4 +18,4 @@ proc-macro2 = "^1"
[dev-dependencies]
ntex = { version = "0.5.0", features = ["tokio"] }
futures = "0.3"
env_logger = "0.9"
env_logger = "0.10"

2
ntex-tls/Cargo.toml
View file

@ -40,6 +40,6 @@ tls_rust = { version = "0.20", package = "rustls", optional = true }
[dev-dependencies]
ntex = { version = "0.5", features = ["openssl", "rustls", "tokio"] }
env_logger = "0.9"
env_logger = "0.10"
rustls-pemfile = { version = "0.2" }
webpki-roots = { version = "0.22" }

3
ntex/CHANGES.md
View file

@ -1,5 +1,8 @@
# Changes
## [0.5.30] - 2022-11-25
## [0.5.29] - 2022-11-03
* Handle io disconnect during h1/h2 server handling

6
ntex/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex"
version = "0.5.29"
version = "0.5.30"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Framework for composable network services"
readme = "README.md"
@ -50,7 +50,7 @@ async-std = ["ntex-rt/async-std", "ntex-async-std", "ntex-connect/async-std"]
[dependencies]
ntex-codec = "0.6.2"
ntex-connect = "0.1.0"
ntex-http = "0.1.6"
ntex-http = "0.1.7"
ntex-router = "0.5.1"
ntex-service = "0.3.2"
ntex-macros = "0.1.3"
@ -102,7 +102,7 @@ brotli2 = { version="0.3.2", optional = true }
flate2 = { version = "1.0.22", optional = true }
[dev-dependencies]
env_logger = "0.9"
env_logger = "0.10"
rand = "0.8"
time = "0.3"
futures-util = "0.3"

10
ntex/src/http/client/connector.rs
View file

@ -1,4 +1,4 @@
use std::{rc::Rc, task::Context, task::Poll, time::Duration};
use std::{future::Future, rc::Rc, task::Context, task::Poll, time::Duration};
use ntex_h2::{self as h2};
@ -252,8 +252,12 @@ fn connector(
connector: BoxedConnector,
timeout: Millis,
disconnect_timeout: Millis,
) -> impl Service<Connect, Response = IoBoxed, Error = ConnectError, Future = impl Unpin> + Unpin
{
) -> impl Service<
Connect,
Response = IoBoxed,
Error = ConnectError,
Future = impl Unpin + Future,
> + Unpin {
TimeoutService::new(
timeout,
apply_fn(connector, |msg: Connect, srv| {

4
ntex/src/http/h1/decoder.rs
View file

@ -986,8 +986,8 @@ mod tests {
.get_all(SET_COOKIE)
.map(|v| v.to_str().unwrap().to_owned())
.collect();
assert_eq!(val[1], "c1=cookie1");
assert_eq!(val[0], "c2=cookie2");
assert_eq!(val[0], "c1=cookie1");
assert_eq!(val[1], "c2=cookie2");
}
#[test]

8
ntex/src/http/response.rs
View file

@ -479,7 +479,7 @@ impl ResponseBuilder {
/// builder.finish()
/// }
/// ```
pub fn del_cookie<'a>(&mut self, cookie: &Cookie<'a>) -> &mut Self {
pub fn del_cookie<'c>(&mut self, cookie: &Cookie<'c>) -> &mut Self {
if self.cookies.is_none() {
self.cookies = Some(CookieJar::new())
}
@ -841,7 +841,7 @@ mod tests {
.max_age(time::Duration::days(1))
.finish(),
)
.del_cookie(&cookies[1])
.del_cookie(&cookies[0])
.finish();
let mut val: Vec<_> = resp
@ -876,9 +876,9 @@ mod tests {
let mut iter = r.cookies();
let v = iter.next().unwrap();
assert_eq!((v.name(), v.value()), ("cookie3", "val300"));
let v = iter.next().unwrap();
assert_eq!((v.name(), v.value()), ("original", "val100"));
let v = iter.next().unwrap();
assert_eq!((v.name(), v.value()), ("cookie3", "val300"));
}
#[test]

5
ntex/src/server/builder.rs
View file

@ -425,7 +425,6 @@ impl ServerBuilder {
.iter()
.map(move |worker| worker.1.stop(graceful))
.collect();
spawn(async move {
let _ = join_all(futs).await;
@ -441,6 +440,10 @@ impl ServerBuilder {
}
});
} else {
self.workers.iter().for_each(move |worker| {
worker.1.stop(false);
});
// we need to stop system if server was spawned
if self.exit {
spawn(async {

18
ntex/src/server/worker.rs
View file

@ -6,7 +6,7 @@ use async_oneshot as oneshot;
use crate::rt::{spawn, Arbiter};
use crate::time::{sleep, Millis, Sleep};
use crate::util::{join_all, ready, Stream as FutStream};
use crate::util::{join_all, ready, select, stream_recv, Either, Stream as FutStream};
use super::accept::{AcceptNotify, Command};
use super::service::{BoxedServerService, InternalServiceFactory, ServerMessage};
@ -167,12 +167,12 @@ impl Worker {
let avail = availability.clone();
Arbiter::default().exec_fn(move || {
let _ = spawn(async move {
spawn(async move {
match Worker::create(rx1, rx2, factories, availability, shutdown_timeout)
.await
{
Ok(wrk) => {
let _ = spawn(wrk);
spawn(wrk);
}
Err(e) => {
error!("Cannot start worker: {:?}", e);
@ -218,7 +218,17 @@ impl Worker {
}));
}
let res: Result<Vec<_>, _> = join_all(fut).await.into_iter().collect();
let res: Result<Vec<_>, _> =
match select(join_all(fut), stream_recv(&mut wrk.rx2)).await {
Either::Left(result) => result.into_iter().collect(),
Either::Right(Some(StopCommand { mut result, .. })) => {
trace!("Shutdown uninitialized worker");
wrk.shutdown(true);
let _ = result.send(false);
return Err(());
}
Either::Right(None) => Err(()),
};
match res {
Ok(services) => {
for item in services {

8
ntex/src/web/httprequest.rs
View file

@ -372,10 +372,10 @@ mod tests {
{
let cookies = req.cookies().unwrap();
assert_eq!(cookies.len(), 2);
assert_eq!(cookies[0].name(), "cookie2");
assert_eq!(cookies[0].value(), "value2");
assert_eq!(cookies[1].name(), "cookie1");
assert_eq!(cookies[1].value(), "value1");
assert_eq!(cookies[0].name(), "cookie1");
assert_eq!(cookies[0].value(), "value1");
assert_eq!(cookies[1].name(), "cookie2");
assert_eq!(cookies[1].value(), "value2");
}
let cookie = req.cookie("cookie1");