Fix tests

kamu-data · Oct 3, 2024 · 0f8ffce · 0f8ffce
1 parent fea8286
commit 0f8ffce
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 58 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/adapter/http/src/data/dataset_info_handler.rs b/src/adapter/http/src/data/dataset_info_handler.rs
@@ -18,6 +18,7 @@
 
 use axum::extract::{Extension, Path};
 use axum::response::Json;
+use database_common_macros::transactional_handler;
 use dill::Catalog;
 use http_common::*;
 use kamu_core::{DatasetRepository, GetDatasetError};
@@ -35,6 +36,7 @@ pub struct Response {
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+#[transactional_handler]
 pub async fn dataset_info_handler(
     Extension(catalog): Extension<Catalog>,
     Path(dataset_id): Path<DatasetID>,

diff --git a/src/adapter/http/tests/harness/server_side_s3_harness.rs b/src/adapter/http/tests/harness/server_side_s3_harness.rs
@@ -99,7 +99,7 @@ impl ServerSideS3Harness {
                 .add_builder(
                     DatasetRepositoryS3::builder()
                         .with_s3_context(s3_context.clone())
-                        .with_multi_tenant(false),
+                        .with_multi_tenant(options.multi_tenant),
                 )
                 .bind::<dyn DatasetRepository, DatasetRepositoryS3>()
                 .bind::<dyn DatasetRepositoryWriter, DatasetRepositoryS3>()

diff --git a/src/adapter/http/tests/tests/mod.rs b/src/adapter/http/tests/tests/mod.rs
@@ -102,7 +102,7 @@ macro_rules! test_client_server_s3_harness_permutations {
         paste::paste! {
             #[test_group::group(containerized)]
             #[test_log::test(tokio::test)]
-            async fn [<$test_name "_st_client_st_local_fs_server">] () {
+            async fn [<$test_name "_st_client_st_s3_server">] () {
                 $test_package::$test_name(
                     ClientSideHarness::new(ClientSideHarnessOptions { multi_tenant: false, authenticated_remotely: true }),
                     ServerSideS3Harness::new(ServerSideHarnessOptions {
@@ -118,7 +118,7 @@ macro_rules! test_client_server_s3_harness_permutations {
         paste::paste! {
             #[test_group::group(containerized)]
             #[test_log::test(tokio::test)]
-            async fn [<$test_name "_st_client_mt_local_fs_server">] () {
+            async fn [<$test_name "_st_client_mt_s3_server">] () {
                 $test_package::$test_name(
                     ClientSideHarness::new(ClientSideHarnessOptions { multi_tenant: false, authenticated_remotely: true }),
                     ServerSideS3Harness::new(ServerSideHarnessOptions {

diff --git a/src/adapter/http/tests/tests/test_data_query.rs b/src/adapter/http/tests/tests/test_data_query.rs
@@ -25,6 +25,7 @@ use serde_json::json;
 use crate::harness::*;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 struct Harness {
     #[allow(dead_code)]
     run_info_dir: tempfile::TempDir,

diff --git a/src/adapter/http/tests/tests/tests_push/test_smart_push_shared.rs b/src/adapter/http/tests/tests/tests_push/test_smart_push_shared.rs
@@ -382,7 +382,7 @@ pub(crate) async fn test_smart_push_via_repo_ref<TServerHarness: ServerSideHarne
             .client_harness
             .push_dataset_result(
                 scenario.client_dataset_ref,
-                scenario.server_dataset_ref.into(),
+                scenario.server_dataset_ref,
                 false,
                 DatasetVisibility::Private,
             )

diff --git a/src/infra/core/Cargo.toml b/src/infra/core/Cargo.toml
@@ -163,7 +163,6 @@ filetime = "0.2"
 indoc = "2"
 mockall = { version = "0.13", default-features = false }
 nanoid = "0.4.0"
-mockito = "1.5.0"
 test-group = { version = "1" }
 test-log = { version = "0.2", features = ["trace"] }
 tokio = { version = "1", default-features = false, features = ["rt", "macros"] }

diff --git a/src/utils/database-common/src/plugins/sqlite_plugin.rs b/src/utils/database-common/src/plugins/sqlite_plugin.rs
@@ -29,7 +29,6 @@ impl SqlitePlugin {
     }
 
     pub fn init_database_components(catalog_builder: &mut CatalogBuilder) {
-        println!("qwe");
         catalog_builder.add::<Self>();
         catalog_builder.add::<SqliteTransactionManager>();
     }