From b293d4c9990b33bb67602be45645690d80ea9d47 Mon Sep 17 00:00:00 2001 From: Zeke Foppa Date: Thu, 12 Feb 2026 10:03:38 -0800 Subject: [PATCH 1/4] [bfops/fix-double-runs]: CI - Fix smoketests running twice --- crates/smoketests/tests/mod.rs | 35 ---------------------------------- 1 file changed, 35 deletions(-) diff --git a/crates/smoketests/tests/mod.rs b/crates/smoketests/tests/mod.rs index 358436c0ea1..4f773726a20 100644 --- a/crates/smoketests/tests/mod.rs +++ b/crates/smoketests/tests/mod.rs @@ -1,36 +1 @@ -// All smoketest modules -pub mod add_remove_index; -pub mod auto_inc; -pub mod auto_migration; -pub mod call; pub mod cli; -pub mod client_connection_errors; -pub mod confirmed_reads; -pub mod connect_disconnect_from_cli; -pub mod create_project; -pub mod csharp_module; -pub mod default_module_clippy; -pub mod delete_database; -pub mod describe; -pub mod detect_wasm_bindgen; -pub mod dml; -pub mod domains; -pub mod energy; -pub mod fail_initial_publish; -pub mod filtering; -pub mod http_egress; -pub mod module_nested_op; -pub mod modules; -pub mod namespaces; -pub mod new_user_flow; -pub mod panic; -pub mod permissions; -pub mod pg_wire; -pub mod quickstart; -pub mod restart; -pub mod rls; -pub mod schedule_reducer; -pub mod servers; -pub mod sql; -pub mod timestamp_route; -pub mod views; From e9c4aac9f6e2af5ce02c52c00bce96b335a1235e Mon Sep 17 00:00:00 2001 From: Zeke Foppa Date: Mon, 16 Feb 2026 09:56:24 -0800 Subject: [PATCH 2/4] [bfops/fix-double-runs]: revert --- crates/smoketests/tests/mod.rs | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/crates/smoketests/tests/mod.rs b/crates/smoketests/tests/mod.rs index 4f773726a20..358436c0ea1 100644 --- a/crates/smoketests/tests/mod.rs +++ b/crates/smoketests/tests/mod.rs @@ -1 +1,36 @@ +// All smoketest modules +pub mod add_remove_index; +pub mod auto_inc; +pub mod auto_migration; +pub mod call; pub mod cli; +pub mod client_connection_errors; +pub mod confirmed_reads; +pub mod connect_disconnect_from_cli; +pub mod create_project; +pub mod csharp_module; +pub mod default_module_clippy; +pub mod delete_database; +pub mod describe; +pub mod detect_wasm_bindgen; +pub mod dml; +pub mod domains; +pub mod energy; +pub mod fail_initial_publish; +pub mod filtering; +pub mod http_egress; +pub mod module_nested_op; +pub mod modules; +pub mod namespaces; +pub mod new_user_flow; +pub mod panic; +pub mod permissions; +pub mod pg_wire; +pub mod quickstart; +pub mod restart; +pub mod rls; +pub mod schedule_reducer; +pub mod servers; +pub mod sql; +pub mod timestamp_route; +pub mod views; From 6833d05198bf6d0e9cbb214c0b7de20ec372f08e Mon Sep 17 00:00:00 2001 From: Zeke Foppa Date: Mon, 16 Feb 2026 09:56:31 -0800 Subject: [PATCH 3/4] [bfops/fix-double-runs]: Revert "Smoketests - Collapse one directory level (#4184)" This reverts commit eb2997e69b97d0043c0e965c05d961043557e090. --- crates/smoketests/tests/integration.rs | 2 ++ crates/smoketests/tests/{ => smoketests}/add_remove_index.rs | 0 crates/smoketests/tests/{ => smoketests}/auto_inc.rs | 0 crates/smoketests/tests/{ => smoketests}/auto_migration.rs | 0 crates/smoketests/tests/{ => smoketests}/call.rs | 0 crates/smoketests/tests/{ => smoketests}/cli/dev.rs | 0 crates/smoketests/tests/{ => smoketests}/cli/mod.rs | 0 crates/smoketests/tests/{ => smoketests}/cli/publish.rs | 0 crates/smoketests/tests/{ => smoketests}/cli/server.rs | 0 .../tests/{ => smoketests}/client_connection_errors.rs | 0 crates/smoketests/tests/{ => smoketests}/confirmed_reads.rs | 0 .../tests/{ => smoketests}/connect_disconnect_from_cli.rs | 0 crates/smoketests/tests/{ => smoketests}/create_project.rs | 0 crates/smoketests/tests/{ => smoketests}/csharp_module.rs | 0 .../tests/{ => smoketests}/default_module_clippy.rs | 0 crates/smoketests/tests/{ => smoketests}/delete_database.rs | 0 crates/smoketests/tests/{ => smoketests}/describe.rs | 0 .../smoketests/tests/{ => smoketests}/detect_wasm_bindgen.rs | 0 crates/smoketests/tests/{ => smoketests}/dml.rs | 0 crates/smoketests/tests/{ => smoketests}/domains.rs | 0 crates/smoketests/tests/{ => smoketests}/energy.rs | 0 .../smoketests/tests/{ => smoketests}/fail_initial_publish.rs | 0 crates/smoketests/tests/{ => smoketests}/filtering.rs | 0 crates/smoketests/tests/{ => smoketests}/mod.rs | 0 crates/smoketests/tests/{ => smoketests}/module_nested_op.rs | 0 crates/smoketests/tests/{ => smoketests}/modules.rs | 0 crates/smoketests/tests/{ => smoketests}/namespaces.rs | 0 crates/smoketests/tests/{ => smoketests}/new_user_flow.rs | 0 crates/smoketests/tests/{ => smoketests}/panic.rs | 0 crates/smoketests/tests/{ => smoketests}/permissions.rs | 0 crates/smoketests/tests/{ => smoketests}/pg_wire.rs | 0 crates/smoketests/tests/{ => smoketests}/quickstart.rs | 0 crates/smoketests/tests/{ => smoketests}/restart.rs | 0 crates/smoketests/tests/{ => smoketests}/rls.rs | 0 crates/smoketests/tests/{ => smoketests}/schedule_reducer.rs | 0 crates/smoketests/tests/{ => smoketests}/servers.rs | 0 crates/smoketests/tests/{ => smoketests}/sql.rs | 0 crates/smoketests/tests/{ => smoketests}/timestamp_route.rs | 0 crates/smoketests/tests/{ => smoketests}/views.rs | 4 ++-- 39 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 crates/smoketests/tests/integration.rs rename crates/smoketests/tests/{ => smoketests}/add_remove_index.rs (100%) rename crates/smoketests/tests/{ => smoketests}/auto_inc.rs (100%) rename crates/smoketests/tests/{ => smoketests}/auto_migration.rs (100%) rename crates/smoketests/tests/{ => smoketests}/call.rs (100%) rename crates/smoketests/tests/{ => smoketests}/cli/dev.rs (100%) rename crates/smoketests/tests/{ => smoketests}/cli/mod.rs (100%) rename crates/smoketests/tests/{ => smoketests}/cli/publish.rs (100%) rename crates/smoketests/tests/{ => smoketests}/cli/server.rs (100%) rename crates/smoketests/tests/{ => smoketests}/client_connection_errors.rs (100%) rename crates/smoketests/tests/{ => smoketests}/confirmed_reads.rs (100%) rename crates/smoketests/tests/{ => smoketests}/connect_disconnect_from_cli.rs (100%) rename crates/smoketests/tests/{ => smoketests}/create_project.rs (100%) rename crates/smoketests/tests/{ => smoketests}/csharp_module.rs (100%) rename crates/smoketests/tests/{ => smoketests}/default_module_clippy.rs (100%) rename crates/smoketests/tests/{ => smoketests}/delete_database.rs (100%) rename crates/smoketests/tests/{ => smoketests}/describe.rs (100%) rename crates/smoketests/tests/{ => smoketests}/detect_wasm_bindgen.rs (100%) rename crates/smoketests/tests/{ => smoketests}/dml.rs (100%) rename crates/smoketests/tests/{ => smoketests}/domains.rs (100%) rename crates/smoketests/tests/{ => smoketests}/energy.rs (100%) rename crates/smoketests/tests/{ => smoketests}/fail_initial_publish.rs (100%) rename crates/smoketests/tests/{ => smoketests}/filtering.rs (100%) rename crates/smoketests/tests/{ => smoketests}/mod.rs (100%) rename crates/smoketests/tests/{ => smoketests}/module_nested_op.rs (100%) rename crates/smoketests/tests/{ => smoketests}/modules.rs (100%) rename crates/smoketests/tests/{ => smoketests}/namespaces.rs (100%) rename crates/smoketests/tests/{ => smoketests}/new_user_flow.rs (100%) rename crates/smoketests/tests/{ => smoketests}/panic.rs (100%) rename crates/smoketests/tests/{ => smoketests}/permissions.rs (100%) rename crates/smoketests/tests/{ => smoketests}/pg_wire.rs (100%) rename crates/smoketests/tests/{ => smoketests}/quickstart.rs (100%) rename crates/smoketests/tests/{ => smoketests}/restart.rs (100%) rename crates/smoketests/tests/{ => smoketests}/rls.rs (100%) rename crates/smoketests/tests/{ => smoketests}/schedule_reducer.rs (100%) rename crates/smoketests/tests/{ => smoketests}/servers.rs (100%) rename crates/smoketests/tests/{ => smoketests}/sql.rs (100%) rename crates/smoketests/tests/{ => smoketests}/timestamp_route.rs (100%) rename crates/smoketests/tests/{ => smoketests}/views.rs (98%) diff --git a/crates/smoketests/tests/integration.rs b/crates/smoketests/tests/integration.rs new file mode 100644 index 00000000000..dd50b65bb8b --- /dev/null +++ b/crates/smoketests/tests/integration.rs @@ -0,0 +1,2 @@ +// Single test binary entry point - includes all smoketests +mod smoketests; diff --git a/crates/smoketests/tests/add_remove_index.rs b/crates/smoketests/tests/smoketests/add_remove_index.rs similarity index 100% rename from crates/smoketests/tests/add_remove_index.rs rename to crates/smoketests/tests/smoketests/add_remove_index.rs diff --git a/crates/smoketests/tests/auto_inc.rs b/crates/smoketests/tests/smoketests/auto_inc.rs similarity index 100% rename from crates/smoketests/tests/auto_inc.rs rename to crates/smoketests/tests/smoketests/auto_inc.rs diff --git a/crates/smoketests/tests/auto_migration.rs b/crates/smoketests/tests/smoketests/auto_migration.rs similarity index 100% rename from crates/smoketests/tests/auto_migration.rs rename to crates/smoketests/tests/smoketests/auto_migration.rs diff --git a/crates/smoketests/tests/call.rs b/crates/smoketests/tests/smoketests/call.rs similarity index 100% rename from crates/smoketests/tests/call.rs rename to crates/smoketests/tests/smoketests/call.rs diff --git a/crates/smoketests/tests/cli/dev.rs b/crates/smoketests/tests/smoketests/cli/dev.rs similarity index 100% rename from crates/smoketests/tests/cli/dev.rs rename to crates/smoketests/tests/smoketests/cli/dev.rs diff --git a/crates/smoketests/tests/cli/mod.rs b/crates/smoketests/tests/smoketests/cli/mod.rs similarity index 100% rename from crates/smoketests/tests/cli/mod.rs rename to crates/smoketests/tests/smoketests/cli/mod.rs diff --git a/crates/smoketests/tests/cli/publish.rs b/crates/smoketests/tests/smoketests/cli/publish.rs similarity index 100% rename from crates/smoketests/tests/cli/publish.rs rename to crates/smoketests/tests/smoketests/cli/publish.rs diff --git a/crates/smoketests/tests/cli/server.rs b/crates/smoketests/tests/smoketests/cli/server.rs similarity index 100% rename from crates/smoketests/tests/cli/server.rs rename to crates/smoketests/tests/smoketests/cli/server.rs diff --git a/crates/smoketests/tests/client_connection_errors.rs b/crates/smoketests/tests/smoketests/client_connection_errors.rs similarity index 100% rename from crates/smoketests/tests/client_connection_errors.rs rename to crates/smoketests/tests/smoketests/client_connection_errors.rs diff --git a/crates/smoketests/tests/confirmed_reads.rs b/crates/smoketests/tests/smoketests/confirmed_reads.rs similarity index 100% rename from crates/smoketests/tests/confirmed_reads.rs rename to crates/smoketests/tests/smoketests/confirmed_reads.rs diff --git a/crates/smoketests/tests/connect_disconnect_from_cli.rs b/crates/smoketests/tests/smoketests/connect_disconnect_from_cli.rs similarity index 100% rename from crates/smoketests/tests/connect_disconnect_from_cli.rs rename to crates/smoketests/tests/smoketests/connect_disconnect_from_cli.rs diff --git a/crates/smoketests/tests/create_project.rs b/crates/smoketests/tests/smoketests/create_project.rs similarity index 100% rename from crates/smoketests/tests/create_project.rs rename to crates/smoketests/tests/smoketests/create_project.rs diff --git a/crates/smoketests/tests/csharp_module.rs b/crates/smoketests/tests/smoketests/csharp_module.rs similarity index 100% rename from crates/smoketests/tests/csharp_module.rs rename to crates/smoketests/tests/smoketests/csharp_module.rs diff --git a/crates/smoketests/tests/default_module_clippy.rs b/crates/smoketests/tests/smoketests/default_module_clippy.rs similarity index 100% rename from crates/smoketests/tests/default_module_clippy.rs rename to crates/smoketests/tests/smoketests/default_module_clippy.rs diff --git a/crates/smoketests/tests/delete_database.rs b/crates/smoketests/tests/smoketests/delete_database.rs similarity index 100% rename from crates/smoketests/tests/delete_database.rs rename to crates/smoketests/tests/smoketests/delete_database.rs diff --git a/crates/smoketests/tests/describe.rs b/crates/smoketests/tests/smoketests/describe.rs similarity index 100% rename from crates/smoketests/tests/describe.rs rename to crates/smoketests/tests/smoketests/describe.rs diff --git a/crates/smoketests/tests/detect_wasm_bindgen.rs b/crates/smoketests/tests/smoketests/detect_wasm_bindgen.rs similarity index 100% rename from crates/smoketests/tests/detect_wasm_bindgen.rs rename to crates/smoketests/tests/smoketests/detect_wasm_bindgen.rs diff --git a/crates/smoketests/tests/dml.rs b/crates/smoketests/tests/smoketests/dml.rs similarity index 100% rename from crates/smoketests/tests/dml.rs rename to crates/smoketests/tests/smoketests/dml.rs diff --git a/crates/smoketests/tests/domains.rs b/crates/smoketests/tests/smoketests/domains.rs similarity index 100% rename from crates/smoketests/tests/domains.rs rename to crates/smoketests/tests/smoketests/domains.rs diff --git a/crates/smoketests/tests/energy.rs b/crates/smoketests/tests/smoketests/energy.rs similarity index 100% rename from crates/smoketests/tests/energy.rs rename to crates/smoketests/tests/smoketests/energy.rs diff --git a/crates/smoketests/tests/fail_initial_publish.rs b/crates/smoketests/tests/smoketests/fail_initial_publish.rs similarity index 100% rename from crates/smoketests/tests/fail_initial_publish.rs rename to crates/smoketests/tests/smoketests/fail_initial_publish.rs diff --git a/crates/smoketests/tests/filtering.rs b/crates/smoketests/tests/smoketests/filtering.rs similarity index 100% rename from crates/smoketests/tests/filtering.rs rename to crates/smoketests/tests/smoketests/filtering.rs diff --git a/crates/smoketests/tests/mod.rs b/crates/smoketests/tests/smoketests/mod.rs similarity index 100% rename from crates/smoketests/tests/mod.rs rename to crates/smoketests/tests/smoketests/mod.rs diff --git a/crates/smoketests/tests/module_nested_op.rs b/crates/smoketests/tests/smoketests/module_nested_op.rs similarity index 100% rename from crates/smoketests/tests/module_nested_op.rs rename to crates/smoketests/tests/smoketests/module_nested_op.rs diff --git a/crates/smoketests/tests/modules.rs b/crates/smoketests/tests/smoketests/modules.rs similarity index 100% rename from crates/smoketests/tests/modules.rs rename to crates/smoketests/tests/smoketests/modules.rs diff --git a/crates/smoketests/tests/namespaces.rs b/crates/smoketests/tests/smoketests/namespaces.rs similarity index 100% rename from crates/smoketests/tests/namespaces.rs rename to crates/smoketests/tests/smoketests/namespaces.rs diff --git a/crates/smoketests/tests/new_user_flow.rs b/crates/smoketests/tests/smoketests/new_user_flow.rs similarity index 100% rename from crates/smoketests/tests/new_user_flow.rs rename to crates/smoketests/tests/smoketests/new_user_flow.rs diff --git a/crates/smoketests/tests/panic.rs b/crates/smoketests/tests/smoketests/panic.rs similarity index 100% rename from crates/smoketests/tests/panic.rs rename to crates/smoketests/tests/smoketests/panic.rs diff --git a/crates/smoketests/tests/permissions.rs b/crates/smoketests/tests/smoketests/permissions.rs similarity index 100% rename from crates/smoketests/tests/permissions.rs rename to crates/smoketests/tests/smoketests/permissions.rs diff --git a/crates/smoketests/tests/pg_wire.rs b/crates/smoketests/tests/smoketests/pg_wire.rs similarity index 100% rename from crates/smoketests/tests/pg_wire.rs rename to crates/smoketests/tests/smoketests/pg_wire.rs diff --git a/crates/smoketests/tests/quickstart.rs b/crates/smoketests/tests/smoketests/quickstart.rs similarity index 100% rename from crates/smoketests/tests/quickstart.rs rename to crates/smoketests/tests/smoketests/quickstart.rs diff --git a/crates/smoketests/tests/restart.rs b/crates/smoketests/tests/smoketests/restart.rs similarity index 100% rename from crates/smoketests/tests/restart.rs rename to crates/smoketests/tests/smoketests/restart.rs diff --git a/crates/smoketests/tests/rls.rs b/crates/smoketests/tests/smoketests/rls.rs similarity index 100% rename from crates/smoketests/tests/rls.rs rename to crates/smoketests/tests/smoketests/rls.rs diff --git a/crates/smoketests/tests/schedule_reducer.rs b/crates/smoketests/tests/smoketests/schedule_reducer.rs similarity index 100% rename from crates/smoketests/tests/schedule_reducer.rs rename to crates/smoketests/tests/smoketests/schedule_reducer.rs diff --git a/crates/smoketests/tests/servers.rs b/crates/smoketests/tests/smoketests/servers.rs similarity index 100% rename from crates/smoketests/tests/servers.rs rename to crates/smoketests/tests/smoketests/servers.rs diff --git a/crates/smoketests/tests/sql.rs b/crates/smoketests/tests/smoketests/sql.rs similarity index 100% rename from crates/smoketests/tests/sql.rs rename to crates/smoketests/tests/smoketests/sql.rs diff --git a/crates/smoketests/tests/timestamp_route.rs b/crates/smoketests/tests/smoketests/timestamp_route.rs similarity index 100% rename from crates/smoketests/tests/timestamp_route.rs rename to crates/smoketests/tests/smoketests/timestamp_route.rs diff --git a/crates/smoketests/tests/views.rs b/crates/smoketests/tests/smoketests/views.rs similarity index 98% rename from crates/smoketests/tests/views.rs rename to crates/smoketests/tests/smoketests/views.rs index 2d5f43917a0..29930d0c209 100644 --- a/crates/smoketests/tests/views.rs +++ b/crates/smoketests/tests/smoketests/views.rs @@ -27,7 +27,7 @@ fn test_st_view_tables() { fn test_fail_publish_namespace_collision() { let mut test = Smoketest::builder() // Can't be precompiled because the code is intentionally broken - .module_code(include_str!("../modules/views-broken-namespace/src/lib.rs")) + .module_code(include_str!("../../modules/views-broken-namespace/src/lib.rs")) .autopublish(false) .build(); @@ -43,7 +43,7 @@ fn test_fail_publish_namespace_collision() { fn test_fail_publish_wrong_return_type() { let mut test = Smoketest::builder() // Can't be precompiled because the code is intentionally broken - .module_code(include_str!("../modules/views-broken-return-type/src/lib.rs")) + .module_code(include_str!("../../modules/views-broken-return-type/src/lib.rs")) .autopublish(false) .build(); From e544ed471dc0ba57ec9905ffe046adbf0cc5bd80 Mon Sep 17 00:00:00 2001 From: Zeke Foppa Date: Mon, 16 Feb 2026 09:59:05 -0800 Subject: [PATCH 4/4] [bfops/fix-double-runs]: updates --- .../tests/{ => smoketests}/http_egress.rs | 0 .../tests/{ => smoketests}/integration.rs | 0 crates/smoketests/tests/smoketests/mod.rs | 72 ++++++++++--------- .../publish_upgrade_prompt.rs | 0 4 files changed, 37 insertions(+), 35 deletions(-) rename crates/smoketests/tests/{ => smoketests}/http_egress.rs (100%) rename crates/smoketests/tests/{ => smoketests}/integration.rs (100%) rename crates/smoketests/tests/{ => smoketests}/publish_upgrade_prompt.rs (100%) diff --git a/crates/smoketests/tests/http_egress.rs b/crates/smoketests/tests/smoketests/http_egress.rs similarity index 100% rename from crates/smoketests/tests/http_egress.rs rename to crates/smoketests/tests/smoketests/http_egress.rs diff --git a/crates/smoketests/tests/integration.rs b/crates/smoketests/tests/smoketests/integration.rs similarity index 100% rename from crates/smoketests/tests/integration.rs rename to crates/smoketests/tests/smoketests/integration.rs diff --git a/crates/smoketests/tests/smoketests/mod.rs b/crates/smoketests/tests/smoketests/mod.rs index 358436c0ea1..9df387f83ff 100644 --- a/crates/smoketests/tests/smoketests/mod.rs +++ b/crates/smoketests/tests/smoketests/mod.rs @@ -1,36 +1,38 @@ // All smoketest modules -pub mod add_remove_index; -pub mod auto_inc; -pub mod auto_migration; -pub mod call; -pub mod cli; -pub mod client_connection_errors; -pub mod confirmed_reads; -pub mod connect_disconnect_from_cli; -pub mod create_project; -pub mod csharp_module; -pub mod default_module_clippy; -pub mod delete_database; -pub mod describe; -pub mod detect_wasm_bindgen; -pub mod dml; -pub mod domains; -pub mod energy; -pub mod fail_initial_publish; -pub mod filtering; -pub mod http_egress; -pub mod module_nested_op; -pub mod modules; -pub mod namespaces; -pub mod new_user_flow; -pub mod panic; -pub mod permissions; -pub mod pg_wire; -pub mod quickstart; -pub mod restart; -pub mod rls; -pub mod schedule_reducer; -pub mod servers; -pub mod sql; -pub mod timestamp_route; -pub mod views; +mod add_remove_index; +mod auto_inc; +mod auto_migration; +mod call; +mod cli; +mod client_connection_errors; +mod confirmed_reads; +mod connect_disconnect_from_cli; +mod create_project; +mod csharp_module; +mod default_module_clippy; +mod delete_database; +mod describe; +mod detect_wasm_bindgen; +mod dml; +mod domains; +mod energy; +mod fail_initial_publish; +mod filtering; +mod http_egress; +mod integration; +mod module_nested_op; +mod modules; +mod namespaces; +mod new_user_flow; +mod panic; +mod permissions; +mod pg_wire; +mod publish_upgrade_prompt; +mod quickstart; +mod restart; +mod rls; +mod schedule_reducer; +mod servers; +mod sql; +mod timestamp_route; +mod views; diff --git a/crates/smoketests/tests/publish_upgrade_prompt.rs b/crates/smoketests/tests/smoketests/publish_upgrade_prompt.rs similarity index 100% rename from crates/smoketests/tests/publish_upgrade_prompt.rs rename to crates/smoketests/tests/smoketests/publish_upgrade_prompt.rs