Skip to content

Commit

Permalink
use mod instead of crate for test utils
Browse files Browse the repository at this point in the history
  • Loading branch information
liurenjie1024 committed Dec 4, 2023
1 parent 8c10cb4 commit 4b919a4
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

[workspace]
resolver = "2"
members = ["crates/catalog/*", "crates/iceberg", "crates/test_utils"]
members = ["crates/catalog/*", "crates/iceberg"]

[workspace.dependencies]
anyhow = "1.0.72"
Expand Down
3 changes: 2 additions & 1 deletion crates/catalog/rest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ urlencoding = { workspace = true }
uuid = { workspace = true, features = ["v4"] }

[dev-dependencies]
iceberg_test_utils = { path = "../../test_utils" }
env_logger = { workspace = true }
log = "0.4.20"
mockito = { workspace = true }
port_scanner = { workspace = true }
tokio = { workspace = true }
4 changes: 4 additions & 0 deletions crates/catalog/rest/tests/rest_catalog_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
// under the License.

//! Integration tests for rest catalog.
//!
#[path = "../../../test_utils/mod.rs"]
mod iceberg_test_utils;

use iceberg::spec::{FormatVersion, NestedField, PrimitiveType, Schema, Type};
use iceberg::transaction::Transaction;
Expand Down
25 changes: 0 additions & 25 deletions crates/test_utils/Cargo.toml

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

use crate::cmd::{get_cmd_output, run_command};
use super::cmd::{get_cmd_output, run_command};
use std::process::Command;

/// A utility to manage lifecycle of docker compose.
Expand Down
2 changes: 1 addition & 1 deletion crates/test_utils/src/lib.rs → crates/test_utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
//!
//! It's not intended for use outside of `iceberg-rust`.
#![allow(dead_code)]
use std::sync::Once;

mod cmd;
pub mod docker;

Expand Down

0 comments on commit 4b919a4

Please sign in to comment.