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

fix(tvix/build): Fix tests and clippy warnings on MacOS

Browse source 
When running tests for buildservice on MacOS it would fail
because of the oci test. I also got some clippy warnings on
MacOS because of disabled code.

Change-Id: I235739fa4270a4ef46e54d3e2b8cbb55eb20bdda
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12726
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: Brian Olsen <me@griff.name>
Tested-by: BuildkiteCI
This commit is contained in:
Brian Olsen 2024-11-03 20:18:08 +01:00 committed by clbot
parent 6f914bc0fa
commit 685f25ebff
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tvix/build/src/buildservice/from_addr.rs
View file

@ -14,6 +14,7 @@ use super::oci::OCIBuildService;
/// ///
/// As some of these [BuildService] need to talk to a [BlobService] and /// As some of these [BuildService] need to talk to a [BlobService] and
/// [DirectoryService], these also need to be passed in. /// [DirectoryService], these also need to be passed in.
#[cfg_attr(target_os = "macos", allow(unused_variables))]
pub async fn from_addr<BS, DS>( pub async fn from_addr<BS, DS>(
uri: &str, uri: &str,
blob_service: BS, blob_service: BS,
@ -68,13 +69,17 @@ where
mod tests { mod tests {
use super::from_addr; use super::from_addr;
use rstest::rstest; use rstest::rstest;
use std::sync::{Arc, LazyLock}; use std::sync::Arc;
#[cfg(target_os = "linux")]
use std::sync::LazyLock;
#[cfg(target_os = "linux")]
use tempfile::TempDir; use tempfile::TempDir;
use tvix_castore::{ use tvix_castore::{
blobservice::{BlobService, MemoryBlobService}, blobservice::{BlobService, MemoryBlobService},
directoryservice::{DirectoryService, MemoryDirectoryService}, directoryservice::{DirectoryService, MemoryDirectoryService},
}; };
#[cfg(target_os = "linux")]
static TMPDIR_OCI_1: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap()); static TMPDIR_OCI_1: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap());
#[rstest] #[rstest]
@ -95,9 +100,9 @@ mod tests {
/// Correct scheme to connect to localhost over http, but with additional path, which is invalid. /// Correct scheme to connect to localhost over http, but with additional path, which is invalid.
#[case::grpc_invalid_host_and_path("grpc+http://localhost/some-path", false)] #[case::grpc_invalid_host_and_path("grpc+http://localhost/some-path", false)]
/// This configures OCI, but doesn't specify the bundle path /// This configures OCI, but doesn't specify the bundle path
#[case::oci_missing_bundle_dir("oci://", false)] #[cfg_attr(target_os = "linux", case::oci_missing_bundle_dir("oci://", false))]
/// This configures OCI, specifying the bundle path /// This configures OCI, specifying the bundle path
#[case::oci_bundle_path(&format!("oci://{}", TMPDIR_OCI_1.path().to_str().unwrap()), true)] #[cfg_attr(target_os = "linux", case::oci_bundle_path(&format!("oci://{}", TMPDIR_OCI_1.path().to_str().unwrap()), true))]
#[tokio::test] #[tokio::test]
async fn test_from_addr(#[case] uri_str: &str, #[case] exp_succeed: bool) { async fn test_from_addr(#[case] uri_str: &str, #[case] exp_succeed: bool) {
let blob_service: Arc<dyn BlobService> = Arc::from(MemoryBlobService::default()); let blob_service: Arc<dyn BlobService> = Arc::from(MemoryBlobService::default());