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

refactor(tvix/castore/tests): let gen_*_service return Boxes

Browse source 
Only convert to and reuse an Arc<…> where needed.

Change-Id: I2c1bc69cca5a4a3ebd3bdb33d6e28e1f5fb86cb9
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10514
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
Florian Klink 2023-12-31 23:33:41 +02:00 • committed by flokli
parent 09a92b78d2
commit 597a6b6205
8 changed files with 63 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tvix/castore/src/tests/import.rs
View file

@ -1,7 +1,10 @@
use crate::blobservice::BlobService;
use crate::directoryservice::DirectoryService;
use crate::fixtures::*;
use crate::import::ingest_path;
use crate::proto;
use crate::utils::{gen_blob_service, gen_directory_service};
use std::sync::Arc;
use tempfile::TempDir;
#[cfg(target_family = "unix")]
@ -10,6 +13,9 @@ use std::os::unix::ffi::OsStrExt;
#[cfg(target_family = "unix")]
#[tokio::test]
async fn symlink() {
let blob_service: Arc<dyn BlobService> = gen_blob_service().into();
let directory_service: Arc<dyn DirectoryService> = gen_directory_service().into();
let tmpdir = TempDir::new().unwrap();
std::fs::create_dir_all(&tmpdir).unwrap();
@ -20,8 +26,8 @@ async fn symlink() {
.unwrap();
let root_node = ingest_path(
gen_blob_service(),
gen_directory_service(),
blob_service,
directory_service,
tmpdir.path().join("doesntmatter"),
)
.await
@ -38,15 +44,16 @@ async fn symlink() {
#[tokio::test]
async fn single_file() {
let blob_service: Arc<dyn BlobService> = gen_blob_service().into();
let directory_service: Arc<dyn DirectoryService> = gen_directory_service().into();
let tmpdir = TempDir::new().unwrap();
std::fs::write(tmpdir.path().join("root"), HELLOWORLD_BLOB_CONTENTS).unwrap();
let blob_service = gen_blob_service();
let root_node = ingest_path(
blob_service.clone(),
gen_directory_service(),
directory_service,
tmpdir.path().join("root"),
)
.await
@ -69,6 +76,9 @@ async fn single_file() {
#[cfg(target_family = "unix")]
#[tokio::test]
async fn complicated() {
let blob_service: Arc<dyn BlobService> = gen_blob_service().into();
let directory_service: Arc<dyn DirectoryService> = gen_directory_service().into();
let tmpdir = TempDir::new().unwrap();
// File ``.keep`
@ -80,9 +90,6 @@ async fn complicated() {
// File ``keep/.keep`
std::fs::write(tmpdir.path().join("keep").join(".keep"), vec![]).unwrap();
let blob_service = gen_blob_service();
let directory_service = gen_directory_service();
let root_node = ingest_path(
blob_service.clone(),
directory_service.clone(),