mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/store): drop proto/tests/{utils,grpc_pathinfoservice}.rs

Browse source 
As for grpc_pathinfoservice, we test this in the rstest-based tests,
with more implementations.
tests/utils.rs is unused now.

Change-Id: I62b192170d181e4fb432bf7dfff2057cb048b52c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11279
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2024-03-27 12:26:06 +01:00 committed by flokli
parent ea257589d3
commit 05d3f21eaf
4 changed files with 0 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
tvix/store/src/proto/tests/grpc_pathinfoservice.rs
View file

@ -1,75 +0,0 @@
use crate::proto::get_path_info_request::ByWhat::ByOutputHash;
use crate::proto::path_info_service_server::PathInfoService as GRPCPathInfoService;
use crate::proto::GRPCPathInfoServiceWrapper;
use crate::proto::GetPathInfoRequest;
use crate::proto::PathInfo;
use crate::tests::fixtures::DUMMY_OUTPUT_HASH;
use crate::tests::utils::gen_blob_service;
use crate::tests::utils::gen_directory_service;
use crate::tests::utils::gen_pathinfo_service;
use bytes::Bytes;
use futures::stream::BoxStream;
use std::sync::Arc;
use tonic::Request;
use tvix_castore::proto as castorepb;
/// generates a GRPCPathInfoService out of blob, directory and pathinfo services.
///
/// We only interact with it via the PathInfo GRPC interface.
/// It uses the NonCachingNARCalculationService NARCalculationService to
/// calculate NARs.
fn gen_grpc_service(
) -> Arc<dyn GRPCPathInfoService<ListStream = BoxStream<'static, Result<PathInfo, tonic::Status>>>>
{
let blob_service = gen_blob_service();
let directory_service = gen_directory_service();
Arc::new(GRPCPathInfoServiceWrapper::new(gen_pathinfo_service(
blob_service,
directory_service,
)))
}
/// Trying to get a non-existent PathInfo should return a not found error.
#[tokio::test]
async fn not_found() {
let service = gen_grpc_service();
let resp = service
.get(Request::new(GetPathInfoRequest {
by_what: Some(ByOutputHash(Bytes::from(DUMMY_OUTPUT_HASH.to_vec()))),
}))
.await;
let resp = resp.expect_err("must fail");
assert_eq!(resp.code(), tonic::Code::NotFound);
}
/// Put a PathInfo into the store, get it back.
#[tokio::test]
async fn put_get() {
let service = gen_grpc_service();
let path_info = PathInfo {
node: Some(castorepb::Node {
node: Some(castorepb::node::Node::Symlink(castorepb::SymlinkNode {
name: "00000000000000000000000000000000-foo".into(),
target: "doesntmatter".into(),
})),
}),
..Default::default()
};
let resp = service.put(Request::new(path_info.clone())).await;
assert!(resp.is_ok());
assert_eq!(resp.expect("must succeed").into_inner(), path_info);
let resp = service
.get(Request::new(GetPathInfoRequest {
by_what: Some(ByOutputHash(Bytes::from(DUMMY_OUTPUT_HASH.to_vec()))),
}))
.await;
assert!(resp.is_ok());
assert_eq!(resp.expect("must succeed").into_inner(), path_info);
}

1
tvix/store/src/proto/tests/mod.rs
View file

@ -1,2 +1 @@
mod grpc_pathinfoservice;
mod pathinfo;

1
tvix/store/src/tests/mod.rs
View file

@ -1,3 +1,2 @@
pub mod fixtures;
mod nar_renderer;
pub mod utils;

16
tvix/store/src/tests/utils.rs
View file

@ -1,16 +0,0 @@
use crate::pathinfoservice::{MemoryPathInfoService, PathInfoService};
use std::sync::Arc;
use tvix_castore::{blobservice::BlobService, directoryservice::DirectoryService};
pub use tvix_castore::utils::*;
pub fn gen_pathinfo_service<BS, DS>(
blob_service: BS,
directory_service: DS,
) -> Arc<dyn PathInfoService>
where
BS: AsRef<dyn BlobService> + Send + Sync + 'static,
DS: AsRef<dyn DirectoryService> + Send + Sync + 'static,
{
Arc::new(MemoryPathInfoService::new(blob_service, directory_service))
}