maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/castore): move tests to grpc client, rm tonic-mock

Browse source 
Similar to gen_directorysvc_grpc_client, introduce a
gen_blobsvc_grpc_client function that provides a gRPC client connected
to a blobservice.

The test is update to use that client to test against, rather than the
server trait, removing the last usage of tonic_mock, so it's removed
as well.

Fixes b/243.

Change-Id: If746e8600588da247eb53a63b70fe72f139e9e77
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9564
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2023-10-08 11:31:45 +02:00 • committed by clbot
parent e778a33710
commit c847cc32d9
8 changed files with 63 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

46
tvix/castore/src/proto/tests/grpc_blobservice.rs
View file

@ -1,23 +1,17 @@
use crate::fixtures::{BLOB_A, BLOB_A_DIGEST};
use crate::proto::blob_service_server::BlobService as GRPCBlobService;
use crate::proto::{BlobChunk, GRPCBlobServiceWrapper, ReadBlobRequest, StatBlobRequest};
use crate::utils::gen_blob_service;
use crate::proto::{BlobChunk, ReadBlobRequest, StatBlobRequest};
use crate::utils::gen_blobsvc_grpc_client;
use tokio_stream::StreamExt;
fn gen_grpc_blob_service() -> GRPCBlobServiceWrapper {
let blob_service = gen_blob_service();
GRPCBlobServiceWrapper::from(blob_service)
}
/// Trying to read a non-existent blob should return a not found error.
#[tokio::test]
async fn not_found_read() {
let service = gen_grpc_blob_service();
let mut grpc_client = gen_blobsvc_grpc_client().await;
let resp = service
.read(tonic::Request::new(ReadBlobRequest {
let resp = grpc_client
.read(ReadBlobRequest {
digest: BLOB_A_DIGEST.clone().into(),
}))
})
.await;
// We can't use unwrap_err here, because the Ok value doesn't implement
@ -32,13 +26,13 @@ async fn not_found_read() {
/// Trying to stat a non-existent blob should return a not found error.
#[tokio::test]
async fn not_found_stat() {
let service = gen_grpc_blob_service();
let mut grpc_client = gen_blobsvc_grpc_client().await;
let resp = service
.stat(tonic::Request::new(StatBlobRequest {
let resp = grpc_client
.stat(StatBlobRequest {
digest: BLOB_A_DIGEST.clone().into(),
..Default::default()
}))
})
.await
.expect_err("must fail");
@ -49,13 +43,13 @@ async fn not_found_stat() {
/// Put a blob in the store, get it back.
#[tokio::test]
async fn put_read_stat() {
let service = gen_grpc_blob_service();
let mut grpc_client = gen_blobsvc_grpc_client().await;
// Send blob A.
let put_resp = service
.put(tonic_mock::streaming_request(vec![BlobChunk {
let put_resp = grpc_client
.put(tokio_stream::once(BlobChunk {
data: BLOB_A.clone(),
}]))
}))
.await
.expect("must succeed")
.into_inner();
@ -65,20 +59,20 @@ async fn put_read_stat() {
// Stat for the digest of A.
// We currently don't ask for more granular chunking data, as we don't
// expose it yet.
let _resp = service
.stat(tonic::Request::new(StatBlobRequest {
let _resp = grpc_client
.stat(StatBlobRequest {
digest: BLOB_A_DIGEST.clone().into(),
..Default::default()
}))
})
.await
.expect("must succeed")
.into_inner();
// Read the blob. It should return the same data.
let resp = service
.read(tonic::Request::new(ReadBlobRequest {
let resp = grpc_client
.read(ReadBlobRequest {
digest: BLOB_A_DIGEST.clone().into(),
}))
})
.await;
let mut rx = resp.ok().unwrap().into_inner();

8
tvix/castore/src/proto/tests/grpc_directoryservice.rs
View file

@ -16,9 +16,7 @@ async fn get_directories(
grpc_client: &mut DirectoryServiceClient<Channel>,
get_directory_request: GetDirectoryRequest,
) -> Result<Vec<Directory>, Status> {
let resp = grpc_client
.get(tonic::Request::new(get_directory_request))
.await;
let resp = grpc_client.get(get_directory_request).await;
// if the response is an error itself, return the error, otherwise unpack
let stream = match resp {
@ -39,10 +37,10 @@ async fn not_found() {
let mut grpc_client = gen_directorysvc_grpc_client().await;
let resp = grpc_client
.get(tonic::Request::new(GetDirectoryRequest {
.get(GetDirectoryRequest {
by_what: Some(ByWhat::Digest(DIRECTORY_A.digest().into())),
..Default::default()
}))
})
.await;
let stream = resp.expect("must succeed").into_inner();