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

Improve tests (#547)

Browse source
This commit is contained in:
Nikolay Kim 2025-03-28 09:11:59 +01:00 • committed by GitHub
parent e9a1284151
commit 30928d019c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ntex/tests/http_openssl.rs
View file

@ -425,11 +425,12 @@ async fn test_h2_service_error() {
assert_eq!(bytes, Bytes::from_static(b"error"));
}
struct SetOnDrop(Arc<AtomicUsize>);
struct SetOnDrop(Arc<AtomicUsize>, Arc<Mutex<Option<::oneshot::Sender<()>>>>);
impl Drop for SetOnDrop {
fn drop(&mut self) {
self.0.fetch_add(1, Ordering::Relaxed);
let _ = self.1.lock().unwrap().take().unwrap().send(());
}
}
@ -437,14 +438,18 @@ impl Drop for SetOnDrop {
async fn test_h2_client_drop() -> io::Result<()> {
let count = Arc::new(AtomicUsize::new(0));
let count2 = count.clone();
let (tx, rx) = ::oneshot::channel();
let tx = Arc::new(Mutex::new(Some(tx)));
let srv = test_server(move || {
let tx = tx.clone();
let count = count2.clone();
HttpService::build()
.h2(move |req: Request| {
let tx = tx.clone();
let count = count.clone();
async move {
let _st = SetOnDrop(count);
let _st = SetOnDrop(count, tx);
assert!(req.peer_addr().is_some());
assert_eq!(req.version(), Version::HTTP_2);
sleep(Seconds(100)).await;
@ -457,7 +462,7 @@ async fn test_h2_client_drop() -> io::Result<()> {
let result = timeout(Millis(250), srv.srequest(Method::GET, "/").send()).await;
assert!(result.is_err());
sleep(Millis(250)).await;
let _ = rx.await;
assert_eq!(count.load(Ordering::Relaxed), 1);
Ok(())
}

11
ntex/tests/http_server.rs
View file

@ -723,11 +723,12 @@ async fn test_h1_service_error() {
assert_eq!(bytes, Bytes::from_static(b"error"));
}
struct SetOnDrop(Arc<AtomicUsize>);
struct SetOnDrop(Arc<AtomicUsize>, Option<::oneshot::Sender<()>>);
impl Drop for SetOnDrop {
fn drop(&mut self) {
self.0.fetch_add(1, Ordering::Relaxed);
let _ = self.1.take().unwrap().send(());
}
}
@ -735,13 +736,17 @@ impl Drop for SetOnDrop {
async fn test_h1_client_drop() -> io::Result<()> {
let count = Arc::new(AtomicUsize::new(0));
let count2 = count.clone();
let (tx, rx) = ::oneshot::channel();
let tx = Arc::new(Mutex::new(Some(tx)));
let srv = test_server(move || {
let tx = tx.clone();
let count = count2.clone();
HttpService::build().h1(move |req: Request| {
let tx = tx.clone();
let count = count.clone();
async move {
let _st = SetOnDrop(count);
let _st = SetOnDrop(count, tx.lock().unwrap().take());
assert!(req.peer_addr().is_some());
assert_eq!(req.version(), Version::HTTP_11);
sleep(Millis(500)).await;
@ -752,7 +757,7 @@ async fn test_h1_client_drop() -> io::Result<()> {
let result = timeout(Millis(100), srv.request(Method::GET, "/").send()).await;
assert!(result.is_err());
sleep(Millis(1000)).await;
let _ = rx.await;
assert_eq!(count.load(Ordering::Relaxed), 1);
Ok(())
}