chore(tests): share test context to parallelize integration tests (e7d830b9) · Commits · GitLab.org / orbit / GitLab Knowledge Graph

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -214,7 +214,7 @@ integration-test:
		before_script:
		- !reference [.sccache-template, before_script]
		script:
		- cargo nextest run --profile ci --all-features --test '*' -j 12 --ignore-default-filter -E 'not package(gitaly-client)'
		- cargo nextest run --profile ci --all-features --test '*' --ignore-default-filter -E 'not package(gitaly-client)'
		- sccache --show-stats \|\| true

		gitaly-integration-test:

Cargo.lock

+15 −44

Original line number	Diff line number	Diff line
		@@ -1037,7 +1037,6 @@ dependencies = [
		"futures",
		"serde",
		"serde_json",
		"serial_test",
		"thiserror 2.0.18",
		"tokio",
		"tokio-stream",
		@@ -2750,6 +2749,7 @@ dependencies = [
		"futures",
		"health-check",
		"indexer",
		"integration-testkit",
		"internment",
		"jsonwebtoken",
		"labkit-rs",
		@@ -2766,7 +2766,6 @@ dependencies = [
		"rustls",
		"serde",
		"serde_json",
		"serial_test",
		"smallvec",
		"testcontainers",
		"testcontainers-modules",
		@@ -3329,6 +3328,7 @@ dependencies = [
		"datafusion",
		"futures",
		"gitaly-client",
		"integration-testkit",
		"internment",
		"ontology",
		"opentelemetry",
		@@ -3339,7 +3339,6 @@ dependencies = [
		"query-engine",
		"serde",
		"serde_json",
		"serial_test",
		"sha2",
		"siphon-proto",
		"smallvec",
		@@ -3397,6 +3396,19 @@ version = "3.0.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"

		[[package]]
		name = "integration-testkit"
		version = "0.1.0"
		dependencies = [
		"arrow",
		"clickhouse-client",
		"futures",
		"query-engine",
		"serde_json",
		"testcontainers",
		"tokio",
		]

		[[package]]
		name = "internment"
		version = "0.8.6"
		@@ -5676,15 +5688,6 @@ dependencies = [
		"winapi-util",
		]

		[[package]]
		name = "scc"
		version = "2.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc"
		dependencies = [
		"sdd",
		]

		[[package]]
		name = "schannel"
		version = "0.1.28"
		@@ -5730,12 +5733,6 @@ version = "1.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"

		[[package]]
		name = "sdd"
		version = "3.0.10"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"

		[[package]]
		name = "sec1"
		version = "0.7.3"
		@@ -5968,32 +5965,6 @@ dependencies = [
		"unsafe-libyaml",
		]

		[[package]]
		name = "serial_test"
		version = "3.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "911bd979bf1070a3f3aa7b691a3b3e9968f339ceeec89e08c280a8a22207a32f"
		dependencies = [
		"futures-executor",
		"futures-util",
		"log",
		"once_cell",
		"parking_lot",
		"scc",
		"serial_test_derive",
		]

		[[package]]
		name = "serial_test_derive"
		version = "3.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0a7d91949b85b0d2fb687445e448b40d322b6b3e4af6b44a29b21d9a5f33e6d9"
		dependencies = [
		"proc-macro2",
		"quote",
		"syn",
		]

		[[package]]
		name = "sha1"
		version = "0.10.6"

Cargo.toml

+1 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ members = [
		"crates/siphon-proto",
		"crates/datalake-generator",
		"crates/xtask",
		"crates/integration-testkit",
		]

		[workspace.dependencies]
		@@ -81,8 +82,6 @@ arrow-ipc = "57.2.0"
		clickhouse = { version = "0.14", features = ["inserter"] }
		testcontainers = "0.27.1"
		testcontainers-modules = { version = "0.15.0", features = ["nats", "clickhouse"] }
		serial_test = "3.3.1"

		# Query engine dependencies
		jsonschema = "0.42.0"
		const_format = "0.2.35"

crates/clickhouse-client/Cargo.toml

+0 −1

Original line number	Diff line number	Diff line
		@@ -20,4 +20,3 @@ tracing = { workspace = true }

		[dev-dependencies]
		serde_json = { workspace = true }
		serial_test = { workspace = true }

crates/clickhouse-client/src/configuration.rs

+0 −5

Original line number	Diff line number	Diff line
		@@ -82,8 +82,6 @@ fn env_var_or<T: FromStr>(key: &str, default: T) -> T {

		#[cfg(test)]
		mod tests {
		use serial_test::serial;

		use super::*;

		#[test]
		@@ -170,7 +168,6 @@ mod tests {
		}

		#[test]
		#[serial]
		fn test_from_env_with_prefix_reads_prefixed_variables() {
		unsafe {
		std::env::set_var("DATALAKE_CLICKHOUSE_URL", "http://datalake:8123");
		@@ -195,7 +192,6 @@ mod tests {
		}

		#[test]
		#[serial]
		fn test_from_env_with_empty_prefix_reads_standard_variables() {
		unsafe {
		std::env::set_var("CLICKHOUSE_URL", "http://standard:8123");
		@@ -214,7 +210,6 @@ mod tests {
		}

		#[test]
		#[serial]
		fn test_empty_password_treated_as_none() {
		unsafe {
		std::env::set_var("CLICKHOUSE_PASSWORD", "");