Archives
/
distant
mirror of https://github.com/chipsenkbeil/distant
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

distant-core unit tests compile and pass, integration tests don't yet

Browse Source
pull/146/head
Chip Senkbeil 2 years ago
parent 456b373b80
commit f54eb2f68d
No known key found for this signature in database
GPG Key ID: 35EF1F8EC72A4131
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File

38
distant-core/src/client/searcher.rs
Unescape Escape View File

@ -198,14 +198,14 @@ mod tests {
use crate::DistantClient;
use distant_net::{
common::{FramedTransport, InmemoryTransport, Response},
Client,
Client, ReconnectStrategy,
};
use std::{path::PathBuf, sync::Arc};
use tokio::sync::Mutex;
fn make_session() -> (FramedTransport<InmemoryTransport>, DistantClient) {
let (t1, t2) = FramedTransport::test_pair(100);
(t1, Client::new(t2))
let (t1, t2) = FramedTransport::pair(100);
(t1, Client::spawn_inmemory(t2, ReconnectStrategy::Fail))
}
#[tokio::test]
@ -228,11 +228,11 @@ mod tests {
};
// Wait until we get the request from the session
let req: Request<DistantRequestData> = transport.read().await.unwrap().unwrap();
let req: Request<DistantRequestData> = transport.read_frame_as().await.unwrap().unwrap();
// Send back an acknowledgement that a search was started
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id,
DistantResponseData::SearchStarted { id: rand::random() },
))
@ -264,12 +264,12 @@ mod tests {
);
// Wait until we get the request from the session
let req: Request<DistantRequestData> = transport.read().await.unwrap().unwrap();
let req: Request<DistantRequestData> = transport.read_frame_as().await.unwrap().unwrap();
// Send back an acknowledgement that a searcher was created
let id = rand::random::<SearchId>();
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id.clone(),
DistantResponseData::SearchStarted { id },
))
@ -281,7 +281,7 @@ mod tests {
// Send some matches related to the file
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id,
vec![
DistantResponseData::SearchResults {
@ -383,12 +383,12 @@ mod tests {
);
// Wait until we get the request from the session
let req: Request<DistantRequestData> = transport.read().await.unwrap().unwrap();
let req: Request<DistantRequestData> = transport.read_frame_as().await.unwrap().unwrap();
// Send back an acknowledgement that a searcher was created
let id = rand::random();
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id.clone(),
DistantResponseData::SearchStarted { id },
))
@ -400,7 +400,7 @@ mod tests {
// Send a match from the appropriate origin
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id.clone(),
DistantResponseData::SearchResults {
id,
@ -419,7 +419,7 @@ mod tests {
// Send a chanmatchge from a different origin
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id.clone() + "1",
DistantResponseData::SearchResults {
id,
@ -438,7 +438,7 @@ mod tests {
// Send a chanmatchge from the appropriate origin
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id,
DistantResponseData::SearchResults {
id,
@ -504,12 +504,12 @@ mod tests {
);
// Wait until we get the request from the session
let req: Request<DistantRequestData> = transport.read().await.unwrap().unwrap();
let req: Request<DistantRequestData> = transport.read_frame_as().await.unwrap().unwrap();
// Send back an acknowledgement that a watcher was created
let id = rand::random::<SearchId>();
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id.clone(),
DistantResponseData::SearchStarted { id },
))
@ -518,7 +518,7 @@ mod tests {
// Send some matches from the appropriate origin
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id,
DistantResponseData::SearchResults {
id,
@ -575,10 +575,10 @@ mod tests {
let searcher_2 = Arc::clone(&searcher);
let cancel_task = tokio::spawn(async move { searcher_2.lock().await.cancel().await });
let req: Request<DistantRequestData> = transport.read().await.unwrap().unwrap();
let req: Request<DistantRequestData> = transport.read_frame_as().await.unwrap().unwrap();
transport
.write(Response::new(req.id.clone(), DistantResponseData::Ok))
.write_frame_for(&Response::new(req.id.clone(), DistantResponseData::Ok))
.await
.unwrap();
@ -587,7 +587,7 @@ mod tests {
// Send a match that will get ignored
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id,
DistantResponseData::SearchResults {
id,

38
distant-core/src/client/watcher.rs
Unescape Escape View File

@ -186,14 +186,14 @@ mod tests {
use crate::DistantClient;
use distant_net::{
common::{FramedTransport, InmemoryTransport, Response},
Client,
Client, ReconnectStrategy,
};
use std::sync::Arc;
use tokio::sync::Mutex;
fn make_session() -> (FramedTransport<InmemoryTransport>, DistantClient) {
let (t1, t2) = FramedTransport::test_pair(100);
(t1, Client::new(t2))
let (t1, t2) = FramedTransport::pair(100);
(t1, Client::spawn_inmemory(t2, ReconnectStrategy::Fail))
}
#[tokio::test]
@ -215,11 +215,11 @@ mod tests {
});
// Wait until we get the request from the session
let req: Request<DistantRequestData> = transport.read().await.unwrap().unwrap();
let req: Request<DistantRequestData> = transport.read_frame_as().await.unwrap().unwrap();
// Send back an acknowledgement that a watcher was created
transport
.write(Response::new(req.id, DistantResponseData::Ok))
.write_frame_for(&Response::new(req.id, DistantResponseData::Ok))
.await
.unwrap();
@ -247,11 +247,11 @@ mod tests {
});
// Wait until we get the request from the session
let req: Request<DistantRequestData> = transport.read().await.unwrap().unwrap();
let req: Request<DistantRequestData> = transport.read_frame_as().await.unwrap().unwrap();
// Send back an acknowledgement that a watcher was created
transport
.write(Response::new(req.id.clone(), DistantResponseData::Ok))
.write_frame_for(&Response::new(req.id.clone(), DistantResponseData::Ok))
.await
.unwrap();
@ -260,7 +260,7 @@ mod tests {
// Send some changes related to the file
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id,
vec![
DistantResponseData::Changed(Change {
@ -315,11 +315,11 @@ mod tests {
});
// Wait until we get the request from the session
let req: Request<DistantRequestData> = transport.read().await.unwrap().unwrap();
let req: Request<DistantRequestData> = transport.read_frame_as().await.unwrap().unwrap();
// Send back an acknowledgement that a watcher was created
transport
.write(Response::new(req.id.clone(), DistantResponseData::Ok))
.write_frame_for(&Response::new(req.id.clone(), DistantResponseData::Ok))
.await
.unwrap();
@ -328,7 +328,7 @@ mod tests {
// Send a change from the appropriate origin
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id.clone(),
DistantResponseData::Changed(Change {
kind: ChangeKind::Access,
@ -340,7 +340,7 @@ mod tests {
// Send a change from a different origin
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id.clone() + "1",
DistantResponseData::Changed(Change {
kind: ChangeKind::Content,
@ -352,7 +352,7 @@ mod tests {
// Send a change from the appropriate origin
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id,
DistantResponseData::Changed(Change {
kind: ChangeKind::Remove,
@ -401,17 +401,17 @@ mod tests {
});
// Wait until we get the request from the session
let req: Request<DistantRequestData> = transport.read().await.unwrap().unwrap();
let req: Request<DistantRequestData> = transport.read_frame_as().await.unwrap().unwrap();
// Send back an acknowledgement that a watcher was created
transport
.write(Response::new(req.id.clone(), DistantResponseData::Ok))
.write_frame_for(&Response::new(req.id.clone(), DistantResponseData::Ok))
.await
.unwrap();
// Send some changes from the appropriate origin
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id,
vec![
DistantResponseData::Changed(Change {
@ -457,10 +457,10 @@ mod tests {
let watcher_2 = Arc::clone(&watcher);
let unwatch_task = tokio::spawn(async move { watcher_2.lock().await.unwatch().await });
let req: Request<DistantRequestData> = transport.read().await.unwrap().unwrap();
let req: Request<DistantRequestData> = transport.read_frame_as().await.unwrap().unwrap();
transport
.write(Response::new(req.id.clone(), DistantResponseData::Ok))
.write_frame_for(&Response::new(req.id.clone(), DistantResponseData::Ok))
.await
.unwrap();
@ -468,7 +468,7 @@ mod tests {
unwatch_task.await.unwrap().unwrap();
transport
.write(Response::new(
.write_frame_for(&Response::new(
req.id,
DistantResponseData::Changed(Change {
kind: ChangeKind::Unknown,

Write Preview
Loading…
Cancel
Save