Skip to content

Commit 56e094f

Browse files
rmn-boikormn-boiko
committed
Fix tests
1 parent 61b674a commit 56e094f

19 files changed

+62
-19
lines changed

‎src/adapter/graphql/tests/tests/test_gql_data.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,15 @@ use opendatafabric::*;
2323
/////////////////////////////////////////////////////////////////////////////////////////
2424

2525
fn create_catalog_with_local_workspace(tempdir: &Path, is_multitenant: bool) -> dill::Catalog {
26+
let datasets_dir = tempdir.join("datasets");
27+
std::fs::create_dir(&datasets_dir).unwrap();
28+
2629
dill::CatalogBuilder::new()
2730
.add::<EventBus>()
2831
.add::<DependencyGraphServiceInMemory>()
2932
.add_builder(
3033
DatasetRepositoryLocalFs::builder()
31-
.with_root(tempdir.join("datasets"))
34+
.with_root(datasets_dir)
3235
.with_current_account_subject(Arc::new(CurrentAccountSubject::new_test()))
3336
.with_multi_tenant(is_multitenant),
3437
)

‎src/adapter/graphql/tests/tests/test_gql_dataset_flow_configs.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1099,12 +1099,14 @@ struct FlowConfigHarness {
10991099
impl FlowConfigHarness {
11001100
fn new() -> Self {
11011101
let tempdir = tempfile::tempdir().unwrap();
1102+
let datasets_dir = tempdir.path().join("datasets");
1103+
std::fs::create_dir(&datasets_dir).unwrap();
11021104

11031105
let catalog_base = dill::CatalogBuilder::new()
11041106
.add::<EventBus>()
11051107
.add_builder(
11061108
DatasetRepositoryLocalFs::builder()
1107-
.with_root(tempdir.path().join("datasets"))
1109+
.with_root(datasets_dir)
11081110
.with_multi_tenant(false),
11091111
)
11101112
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/adapter/graphql/tests/tests/test_gql_dataset_flow_runs.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1701,6 +1701,8 @@ impl FlowRunsHarness {
17011701
let tempdir = tempfile::tempdir().unwrap();
17021702
let run_info_dir = tempdir.path().join("run");
17031703
let cache_dir = tempdir.path().join("cache");
1704+
let datasets_dir = tempdir.path().join("datasets");
1705+
std::fs::create_dir(&datasets_dir).unwrap();
17041706
std::fs::create_dir(&run_info_dir).unwrap();
17051707
std::fs::create_dir(&cache_dir).unwrap();
17061708

@@ -1711,7 +1713,7 @@ impl FlowRunsHarness {
17111713
.add::<EventBus>()
17121714
.add_builder(
17131715
DatasetRepositoryLocalFs::builder()
1714-
.with_root(tempdir.path().join("datasets"))
1716+
.with_root(datasets_dir)
17151717
.with_multi_tenant(false),
17161718
)
17171719
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/adapter/graphql/tests/tests/test_gql_metadata.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ use crate::utils::authentication_catalogs;
2323
#[test_log::test(tokio::test)]
2424
async fn test_current_push_sources() {
2525
let tempdir = tempfile::tempdir().unwrap();
26+
let datasets_dir = tempdir.path().join("datasets");
27+
std::fs::create_dir(&datasets_dir).unwrap();
2628

2729
let base_catalog = CatalogBuilder::new()
2830
.add::<EventBus>()
2931
.add_builder(
3032
DatasetRepositoryLocalFs::builder()
31-
.with_root(tempdir.path().join("datasets"))
33+
.with_root(datasets_dir)
3234
.with_multi_tenant(false),
3335
)
3436
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/adapter/graphql/tests/tests/test_gql_metadata_chain.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@ use crate::utils::{authentication_catalogs, expect_anonymous_access_error};
2626
#[test_log::test(tokio::test)]
2727
async fn test_metadata_chain_events() {
2828
let tempdir = tempfile::tempdir().unwrap();
29+
let datasets_dir = tempdir.path().join("datasets");
30+
std::fs::create_dir(&datasets_dir).unwrap();
2931

3032
let base_catalog = dill::CatalogBuilder::new()
3133
.add::<EventBus>()
3234
.add::<DependencyGraphServiceInMemory>()
3335
.add_builder(
3436
DatasetRepositoryLocalFs::builder()
35-
.with_root(tempdir.path().join("datasets"))
37+
.with_root(datasets_dir)
3638
.with_multi_tenant(false),
3739
)
3840
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/adapter/graphql/tests/tests/test_gql_search.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ use opendatafabric::*;
1818
#[tokio::test]
1919
async fn query() {
2020
let tempdir = tempfile::tempdir().unwrap();
21+
let datasets_dir = tempdir.path().join("datasets");
22+
std::fs::create_dir(&datasets_dir).unwrap();
2123

2224
let cat = dill::CatalogBuilder::new()
2325
.add::<EventBus>()
@@ -26,7 +28,7 @@ async fn query() {
2628
.add::<auth::AlwaysHappyDatasetActionAuthorizer>()
2729
.add_builder(
2830
DatasetRepositoryLocalFs::builder()
29-
.with_root(tempdir.path().join("datasets"))
31+
.with_root(datasets_dir)
3032
.with_multi_tenant(false),
3133
)
3234
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/adapter/http/tests/tests/test_dataset_authorization_layer.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ impl ServerHarness {
211211
dataset_action_authorizer: MockDatasetActionAuthorizer,
212212
) -> Self {
213213
let temp_dir = tempfile::TempDir::new().unwrap();
214+
let datasets_dir = temp_dir.path().join("datasets");
215+
std::fs::create_dir(&datasets_dir).unwrap();
214216

215217
let mut catalog_builder = dill::CatalogBuilder::new();
216218
catalog_builder.add::<EventBus>();
@@ -227,7 +229,7 @@ impl ServerHarness {
227229
.add_builder(
228230
DatasetRepositoryLocalFs::builder()
229231
.with_multi_tenant(false)
230-
.with_root(temp_dir.path().join("datasets")),
232+
.with_root(datasets_dir),
231233
)
232234
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>();
233235

‎src/adapter/odata/tests/tests/test_handlers.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,10 @@ impl TestHarness {
261261
let temp_dir = tempfile::tempdir().unwrap();
262262
let run_info_dir = temp_dir.path().join("run");
263263
let cache_dir = temp_dir.path().join("cache");
264+
let datasets_dir = temp_dir.path().join("datasets");
264265
std::fs::create_dir(&run_info_dir).unwrap();
265266
std::fs::create_dir(cache_dir).unwrap();
267+
std::fs::create_dir(&datasets_dir).unwrap();
266268

267269
let catalog = dill::CatalogBuilder::new()
268270
.add::<ObjectStoreRegistryImpl>()
@@ -274,7 +276,7 @@ impl TestHarness {
274276
.bind::<dyn auth::DatasetActionAuthorizer, TDatasetAuthorizer>()
275277
.add_builder(
276278
DatasetRepositoryLocalFs::builder()
277-
.with_root(temp_dir.path().join("datasets"))
279+
.with_root(datasets_dir)
278280
.with_multi_tenant(false),
279281
)
280282
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/infra/core/tests/tests/engine/test_engine_transform.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,10 @@ async fn test_transform_common(transform: Transform) {
211211
let tempdir = tempfile::tempdir().unwrap();
212212
let run_info_dir = tempdir.path().join("run");
213213
let cache_dir = tempdir.path().join("cache");
214+
let datasets_dir = tempdir.path().join("datasets");
214215
std::fs::create_dir(&run_info_dir).unwrap();
215216
std::fs::create_dir(&cache_dir).unwrap();
217+
std::fs::create_dir(&datasets_dir).unwrap();
216218

217219
let catalog = dill::CatalogBuilder::new()
218220
.add_value(ContainerRuntimeConfig::default())
@@ -223,7 +225,7 @@ async fn test_transform_common(transform: Transform) {
223225
.add_value(CurrentAccountSubject::new_test())
224226
.add_builder(
225227
DatasetRepositoryLocalFs::builder()
226-
.with_root(tempdir.path().join("datasets"))
228+
.with_root(datasets_dir)
227229
.with_multi_tenant(false),
228230
)
229231
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/infra/core/tests/tests/ingest/test_polling_ingest.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1085,8 +1085,10 @@ impl IngestTestHarness {
10851085
let temp_dir = tempfile::tempdir().unwrap();
10861086
let run_info_dir = temp_dir.path().join("run");
10871087
let cache_dir = temp_dir.path().join("cache");
1088+
let datasets_dir = temp_dir.path().join("datasets");
10881089
std::fs::create_dir(&run_info_dir).unwrap();
10891090
std::fs::create_dir(&cache_dir).unwrap();
1091+
std::fs::create_dir(&datasets_dir).unwrap();
10901092

10911093
let catalog = dill::CatalogBuilder::new()
10921094
.add_value(ContainerRuntimeConfig::default())
@@ -1100,7 +1102,7 @@ impl IngestTestHarness {
11001102
.bind::<dyn auth::DatasetActionAuthorizer, TDatasetAuthorizer>()
11011103
.add_builder(
11021104
DatasetRepositoryLocalFs::builder()
1103-
.with_root(temp_dir.path().join("datasets"))
1105+
.with_root(datasets_dir)
11041106
.with_multi_tenant(false),
11051107
)
11061108
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/infra/core/tests/tests/ingest/test_push_ingest.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,10 @@ impl IngestTestHarness {
473473
let temp_dir = tempfile::tempdir().unwrap();
474474
let run_info_dir = temp_dir.path().join("run");
475475
let cache_dir = temp_dir.path().join("cache");
476+
let datasets_dir = temp_dir.path().join("datasets");
476477
std::fs::create_dir(&run_info_dir).unwrap();
477478
std::fs::create_dir(cache_dir).unwrap();
479+
std::fs::create_dir(&datasets_dir).unwrap();
478480

479481
let catalog = dill::CatalogBuilder::new()
480482
.add::<EventBus>()
@@ -484,7 +486,7 @@ impl IngestTestHarness {
484486
.bind::<dyn auth::DatasetActionAuthorizer, TDatasetAuthorizer>()
485487
.add_builder(
486488
DatasetRepositoryLocalFs::builder()
487-
.with_root(temp_dir.path().join("datasets"))
489+
.with_root(datasets_dir)
488490
.with_multi_tenant(false),
489491
)
490492
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/infra/core/tests/tests/ingest/test_writer.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -933,6 +933,9 @@ struct Harness {
933933
impl Harness {
934934
async fn new(dataset_events: Vec<odf::MetadataEvent>) -> Self {
935935
let temp_dir = tempfile::tempdir().unwrap();
936+
let datasets_dir = temp_dir.path().join("datasets");
937+
std::fs::create_dir(&datasets_dir).unwrap();
938+
936939
let system_time = Utc.with_ymd_and_hms(2010, 1, 1, 12, 0, 0).unwrap();
937940

938941
let catalog = dill::CatalogBuilder::new()
@@ -942,7 +945,7 @@ impl Harness {
942945
.add_value(CurrentAccountSubject::new_test())
943946
.add_builder(
944947
DatasetRepositoryLocalFs::builder()
945-
.with_root(temp_dir.path().join("datasets"))
948+
.with_root(datasets_dir)
946949
.with_multi_tenant(false),
947950
)
948951
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/infra/core/tests/tests/repos/test_dataset_repository_local_fs.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ impl LocalFsRepoHarness {
3232
dataset_action_authorizer: TDatasetActionAuthorizer,
3333
multi_tenant: bool,
3434
) -> Self {
35+
let datasets_dir = tempdir.path().join("datasets");
36+
std::fs::create_dir(&datasets_dir).unwrap();
37+
3538
let catalog = dill::CatalogBuilder::new()
3639
.add::<EventBus>()
3740
.add::<DependencyGraphServiceInMemory>()
@@ -40,7 +43,7 @@ impl LocalFsRepoHarness {
4043
.bind::<dyn auth::DatasetActionAuthorizer, TDatasetActionAuthorizer>()
4144
.add_builder(
4245
DatasetRepositoryLocalFs::builder()
43-
.with_root(tempdir.path().join("datasets"))
46+
.with_root(datasets_dir)
4447
.with_multi_tenant(multi_tenant),
4548
)
4649
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/infra/core/tests/tests/test_query_service_impl.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,15 @@ fn create_catalog_with_local_workspace(
115115
tempdir: &Path,
116116
dataset_action_authorizer: MockDatasetActionAuthorizer,
117117
) -> dill::Catalog {
118+
let datasets_dir = tempdir.join("datasets");
119+
std::fs::create_dir(&datasets_dir).unwrap();
120+
118121
dill::CatalogBuilder::new()
119122
.add::<EventBus>()
120123
.add::<DependencyGraphServiceInMemory>()
121124
.add_builder(
122125
DatasetRepositoryLocalFs::builder()
123-
.with_root(tempdir.join("datasets"))
126+
.with_root(datasets_dir)
124127
.with_multi_tenant(false),
125128
)
126129
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/infra/core/tests/tests/test_reset_service_impl.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ struct ResetTestHarness {
111111
impl ResetTestHarness {
112112
fn new() -> Self {
113113
let tempdir = tempfile::tempdir().unwrap();
114+
let datasets_dir = tempdir.path().join("datasets");
115+
std::fs::create_dir(&datasets_dir).unwrap();
114116

115117
let catalog = dill::CatalogBuilder::new()
116118
.add::<EventBus>()
@@ -120,7 +122,7 @@ impl ResetTestHarness {
120122
.bind::<dyn auth::DatasetActionAuthorizer, MockDatasetActionAuthorizer>()
121123
.add_builder(
122124
DatasetRepositoryLocalFs::builder()
123-
.with_root(tempdir.path().join("datasets"))
125+
.with_root(datasets_dir)
124126
.with_multi_tenant(false),
125127
)
126128
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/infra/core/tests/tests/test_search_service_impl.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@ async fn do_test_search(tmp_workspace_dir: &Path, repo_url: Url) {
2222
let dataset_local_alias = DatasetAlias::new(None, DatasetName::new_unchecked("foo"));
2323
let repo_name = RepoName::new_unchecked("repo");
2424
let dataset_remote_alias = DatasetAliasRemote::try_from("repo/bar").unwrap();
25+
let datasets_dir = tmp_workspace_dir.join("datasets");
26+
std::fs::create_dir(&datasets_dir).unwrap();
2527

2628
let catalog = dill::CatalogBuilder::new()
2729
.add::<EventBus>()
2830
.add::<DependencyGraphServiceInMemory>()
2931
.add_value(CurrentAccountSubject::new_test())
3032
.add_builder(
3133
DatasetRepositoryLocalFs::builder()
32-
.with_root(tmp_workspace_dir.join("datasets"))
34+
.with_root(datasets_dir)
3335
.with_multi_tenant(false),
3436
)
3537
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/infra/core/tests/tests/test_sync_service_impl.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ async fn do_test_sync(
8383
&dataset_alias_2,
8484
);
8585

86+
let datasets_dir = tmp_workspace_dir.join("datasets");
87+
std::fs::create_dir(&datasets_dir).unwrap();
88+
8689
let catalog = dill::CatalogBuilder::new()
8790
.add::<EventBus>()
8891
.add::<DependencyGraphServiceInMemory>()
@@ -93,7 +96,7 @@ async fn do_test_sync(
9396
.bind::<dyn auth::DatasetActionAuthorizer, MockDatasetActionAuthorizer>()
9497
.add_builder(
9598
DatasetRepositoryLocalFs::builder()
96-
.with_root(tmp_workspace_dir.join("datasets"))
99+
.with_root(datasets_dir)
97100
.with_multi_tenant(false),
98101
)
99102
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

‎src/infra/core/tests/tests/test_transform_service_impl.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ impl TransformTestHarness {
4040
engine_provisioner: TEngineProvisioner,
4141
) -> Self {
4242
let tempdir = tempfile::tempdir().unwrap();
43+
let datasets_dir = tempdir.path().join("datasets");
44+
std::fs::create_dir(&datasets_dir).unwrap();
4345

4446
let catalog = dill::CatalogBuilder::new()
4547
.add::<EventBus>()
@@ -51,7 +53,7 @@ impl TransformTestHarness {
5153
.bind::<dyn EngineProvisioner, TEngineProvisioner>()
5254
.add_builder(
5355
DatasetRepositoryLocalFs::builder()
54-
.with_root(tempdir.path().join("datasets"))
56+
.with_root(datasets_dir)
5557
.with_multi_tenant(false),
5658
)
5759
.add::<SystemTimeSourceDefault>()

‎src/infra/core/tests/tests/test_verification_service_impl.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ use super::test_pull_service_impl::TestTransformService;
2525
#[tokio::test]
2626
async fn test_verify_data_consistency() {
2727
let tempdir = tempfile::tempdir().unwrap();
28+
let datasets_dir = tempdir.path().join("datasets");
29+
std::fs::create_dir(&datasets_dir).unwrap();
2830

2931
let dataset_alias = DatasetAlias::new(None, DatasetName::new_unchecked("bar"));
3032

@@ -38,7 +40,7 @@ async fn test_verify_data_consistency() {
3840
.bind::<dyn auth::DatasetActionAuthorizer, MockDatasetActionAuthorizer>()
3941
.add_builder(
4042
DatasetRepositoryLocalFs::builder()
41-
.with_root(tempdir.path().join("datasets"))
43+
.with_root(datasets_dir)
4244
.with_multi_tenant(false),
4345
)
4446
.bind::<dyn DatasetRepository, DatasetRepositoryLocalFs>()

0 commit comments

Comments
 (0)