diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90aa9d54..013c2fd8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,6 +51,14 @@ jobs: # target/ (and the cache) much smaller than full debug info. CARGO_PROFILE_DEV_DEBUG: line-tables-only CARGO_PROFILE_TEST_DEBUG: line-tables-only + # Build-script dependencies default to no debug info, except crates that + # are also normal dependencies, which take the line above. Which crates + # those are differs between the nextest build and the lib-only doctest + # build (shlex, which cc depends on), so without this the doctest step + # rebuilt cc, every crate whose build script uses it, and everything + # above them. + CARGO_PROFILE_DEV_BUILD_OVERRIDE_DEBUG: line-tables-only + CARGO_PROFILE_TEST_BUILD_OVERRIDE_DEBUG: line-tables-only steps: - uses: actions/checkout@v4 @@ -114,6 +122,9 @@ jobs: - name: Run knowledge graph closure harness if: matrix.os == 'ubuntu-latest' shell: bash + # The harness's own cargo test suites already ran under nextest above. + env: + ATOMIC_HARNESS_SKIP_CARGO_TESTS: 1 run: ATOMIC_BIN="$PWD/target/debug/atomic" bash tests/harness/46_knowledge_graph_closure.sh fmt: diff --git a/atomic-cli/README.md b/atomic-cli/README.md index 4c2963f1..23b48039 100644 --- a/atomic-cli/README.md +++ b/atomic-cli/README.md @@ -940,7 +940,7 @@ Global identity configuration is stored in `~/.config/atomic/` (or platform equi cargo test -p atomic-cli # Validate that every public command path renders help -cargo test -p atomic-cli --test cli_surface_integration_test +cargo test -p atomic-cli --test it -- cli_surface_integration_test:: # Run the black-box CLI harness against a freshly built binary cargo build -p atomic-cli diff --git a/atomic-cli/src/commands/git/import.rs b/atomic-cli/src/commands/git/import.rs index 77a80037..74abacd1 100644 --- a/atomic-cli/src/commands/git/import.rs +++ b/atomic-cli/src/commands/git/import.rs @@ -1825,7 +1825,7 @@ mod tests { } #[test] - #[serial] + #[file_serial] #[cfg_attr( not(unix), ignore = "the Git shim projection requires lossless unix paths (ProjectTreeError::UnsupportedPlatformPath)" @@ -1905,7 +1905,7 @@ mod tests { } #[test] - #[serial] + #[file_serial] #[cfg_attr( not(unix), ignore = "the Git shim projection requires lossless unix paths (ProjectTreeError::UnsupportedPlatformPath)" @@ -1944,7 +1944,7 @@ mod tests { #[cfg(not(unix))] #[test] - #[serial] + #[file_serial] fn stream_refuses_unsupported_native_paths_before_initialization() { let temp = tempfile::tempdir().unwrap(); init_git(temp.path()); @@ -1967,7 +1967,7 @@ mod tests { } #[test] - #[serial] + #[file_serial] #[cfg(unix)] fn stream_flag_imports_spaces_unicode_percent_and_symlinks() { let temp = tempfile::tempdir().unwrap(); @@ -2051,7 +2051,7 @@ mod tests { } #[test] - #[serial] + #[file_serial] fn unsupported_stream_boundary_rejects_before_atomic_or_git_exclude_writes() { let temp = tempfile::tempdir().unwrap(); init_git(temp.path()); diff --git a/atomic-cli/tests/adaptation_regression_test.rs b/atomic-cli/tests/it/adaptation_regression_test.rs similarity index 100% rename from atomic-cli/tests/adaptation_regression_test.rs rename to atomic-cli/tests/it/adaptation_regression_test.rs diff --git a/atomic-cli/tests/agent_capture_oracle_cb12a_test.rs b/atomic-cli/tests/it/agent_capture_oracle_cb12a_test.rs similarity index 100% rename from atomic-cli/tests/agent_capture_oracle_cb12a_test.rs rename to atomic-cli/tests/it/agent_capture_oracle_cb12a_test.rs diff --git a/atomic-cli/tests/agent_error_integration_test.rs b/atomic-cli/tests/it/agent_error_integration_test.rs similarity index 100% rename from atomic-cli/tests/agent_error_integration_test.rs rename to atomic-cli/tests/it/agent_error_integration_test.rs diff --git a/atomic-cli/tests/agent_repair_cb12a_test.rs b/atomic-cli/tests/it/agent_repair_cb12a_test.rs similarity index 100% rename from atomic-cli/tests/agent_repair_cb12a_test.rs rename to atomic-cli/tests/it/agent_repair_cb12a_test.rs diff --git a/atomic-cli/tests/bridge_agent_workflow_regression_test.rs b/atomic-cli/tests/it/bridge_agent_workflow_regression_test.rs similarity index 100% rename from atomic-cli/tests/bridge_agent_workflow_regression_test.rs rename to atomic-cli/tests/it/bridge_agent_workflow_regression_test.rs diff --git a/atomic-cli/tests/build_version_integration_test.rs b/atomic-cli/tests/it/build_version_integration_test.rs similarity index 98% rename from atomic-cli/tests/build_version_integration_test.rs rename to atomic-cli/tests/it/build_version_integration_test.rs index e31804df..99ec2cb4 100644 --- a/atomic-cli/tests/build_version_integration_test.rs +++ b/atomic-cli/tests/it/build_version_integration_test.rs @@ -52,7 +52,7 @@ impl Fixture { "[package]\nname = \"version-fixture\"\nversion = \"0.19.1\"\nedition = \"2021\"\n", ) .unwrap(); - fs::write(source.join("build.rs"), include_str!("../build.rs")).unwrap(); + fs::write(source.join("build.rs"), include_str!("../../build.rs")).unwrap(); fs::write( source.join("src/main.rs"), "fn main() { println!(\"{}\", env!(\"ATOMIC_CLI_VERSION\")); }\n", diff --git a/atomic-cli/tests/change_ledger_integration_test.rs b/atomic-cli/tests/it/change_ledger_integration_test.rs similarity index 100% rename from atomic-cli/tests/change_ledger_integration_test.rs rename to atomic-cli/tests/it/change_ledger_integration_test.rs diff --git a/atomic-cli/tests/change_tree_test.rs b/atomic-cli/tests/it/change_tree_test.rs similarity index 100% rename from atomic-cli/tests/change_tree_test.rs rename to atomic-cli/tests/it/change_tree_test.rs diff --git a/atomic-cli/tests/cli_surface_integration_test.rs b/atomic-cli/tests/it/cli_surface_integration_test.rs similarity index 100% rename from atomic-cli/tests/cli_surface_integration_test.rs rename to atomic-cli/tests/it/cli_surface_integration_test.rs diff --git a/atomic-cli/tests/clone_sidecar_integration_test.rs b/atomic-cli/tests/it/clone_sidecar_integration_test.rs similarity index 100% rename from atomic-cli/tests/clone_sidecar_integration_test.rs rename to atomic-cli/tests/it/clone_sidecar_integration_test.rs diff --git a/atomic-cli/tests/compact_service_integration_test.rs b/atomic-cli/tests/it/compact_service_integration_test.rs similarity index 100% rename from atomic-cli/tests/compact_service_integration_test.rs rename to atomic-cli/tests/it/compact_service_integration_test.rs diff --git a/atomic-cli/tests/concurrent_intent_reads_test.rs b/atomic-cli/tests/it/concurrent_intent_reads_test.rs similarity index 100% rename from atomic-cli/tests/concurrent_intent_reads_test.rs rename to atomic-cli/tests/it/concurrent_intent_reads_test.rs diff --git a/atomic-cli/tests/cross_stream_matrix_test.rs b/atomic-cli/tests/it/cross_stream_matrix_test.rs similarity index 100% rename from atomic-cli/tests/cross_stream_matrix_test.rs rename to atomic-cli/tests/it/cross_stream_matrix_test.rs diff --git a/atomic-cli/tests/git_adoption_cb7b_test.rs b/atomic-cli/tests/it/git_adoption_cb7b_test.rs similarity index 100% rename from atomic-cli/tests/git_adoption_cb7b_test.rs rename to atomic-cli/tests/it/git_adoption_cb7b_test.rs diff --git a/atomic-cli/tests/git_anchor_cb7a_test.rs b/atomic-cli/tests/it/git_anchor_cb7a_test.rs similarity index 100% rename from atomic-cli/tests/git_anchor_cb7a_test.rs rename to atomic-cli/tests/it/git_anchor_cb7a_test.rs diff --git a/atomic-cli/tests/git_binding_cb6a_test.rs b/atomic-cli/tests/it/git_binding_cb6a_test.rs similarity index 100% rename from atomic-cli/tests/git_binding_cb6a_test.rs rename to atomic-cli/tests/it/git_binding_cb6a_test.rs diff --git a/atomic-cli/tests/git_binding_cb6b_test.rs b/atomic-cli/tests/it/git_binding_cb6b_test.rs similarity index 100% rename from atomic-cli/tests/git_binding_cb6b_test.rs rename to atomic-cli/tests/it/git_binding_cb6b_test.rs diff --git a/atomic-cli/tests/git_binding_cb6c_test.rs b/atomic-cli/tests/it/git_binding_cb6c_test.rs similarity index 100% rename from atomic-cli/tests/git_binding_cb6c_test.rs rename to atomic-cli/tests/it/git_binding_cb6c_test.rs diff --git a/atomic-cli/tests/git_bridge_reconcile_preserved_delete_test.rs b/atomic-cli/tests/it/git_bridge_reconcile_preserved_delete_test.rs similarity index 100% rename from atomic-cli/tests/git_bridge_reconcile_preserved_delete_test.rs rename to atomic-cli/tests/it/git_bridge_reconcile_preserved_delete_test.rs diff --git a/atomic-cli/tests/git_cutover_cb13b_test.rs b/atomic-cli/tests/it/git_cutover_cb13b_test.rs similarity index 100% rename from atomic-cli/tests/git_cutover_cb13b_test.rs rename to atomic-cli/tests/it/git_cutover_cb13b_test.rs diff --git a/atomic-cli/tests/git_guard_cb0c_test.rs b/atomic-cli/tests/it/git_guard_cb0c_test.rs similarity index 100% rename from atomic-cli/tests/git_guard_cb0c_test.rs rename to atomic-cli/tests/it/git_guard_cb0c_test.rs diff --git a/atomic-cli/tests/git_import_bypass_cycle_regression.rs b/atomic-cli/tests/it/git_import_bypass_cycle_regression.rs similarity index 100% rename from atomic-cli/tests/git_import_bypass_cycle_regression.rs rename to atomic-cli/tests/it/git_import_bypass_cycle_regression.rs diff --git a/atomic-cli/tests/git_import_cb9a_test.rs b/atomic-cli/tests/it/git_import_cb9a_test.rs similarity index 100% rename from atomic-cli/tests/git_import_cb9a_test.rs rename to atomic-cli/tests/it/git_import_cb9a_test.rs diff --git a/atomic-cli/tests/git_import_cb9b_test.rs b/atomic-cli/tests/it/git_import_cb9b_test.rs similarity index 100% rename from atomic-cli/tests/git_import_cb9b_test.rs rename to atomic-cli/tests/it/git_import_cb9b_test.rs diff --git a/atomic-cli/tests/git_import_cb9c_test.rs b/atomic-cli/tests/it/git_import_cb9c_test.rs similarity index 100% rename from atomic-cli/tests/git_import_cb9c_test.rs rename to atomic-cli/tests/it/git_import_cb9c_test.rs diff --git a/atomic-cli/tests/git_import_corpus_regression_test.rs b/atomic-cli/tests/it/git_import_corpus_regression_test.rs similarity index 100% rename from atomic-cli/tests/git_import_corpus_regression_test.rs rename to atomic-cli/tests/it/git_import_corpus_regression_test.rs diff --git a/atomic-cli/tests/git_import_generated_modify_test.rs b/atomic-cli/tests/it/git_import_generated_modify_test.rs similarity index 97% rename from atomic-cli/tests/git_import_generated_modify_test.rs rename to atomic-cli/tests/it/git_import_generated_modify_test.rs index 5288cb82..a63977a1 100644 --- a/atomic-cli/tests/git_import_generated_modify_test.rs +++ b/atomic-cli/tests/it/git_import_generated_modify_test.rs @@ -143,9 +143,9 @@ fn git_import_records_the_real_helpers_history_with_exact_content() { // import failed with "staged path // 'atomic-cli/src/commands/push/helpers.rs' renders 27472 byte(s) but // the commit tree expects 23819 byte(s)". - let c1 = include_bytes!("fixtures/helpers_c1.rs"); - let c5 = include_bytes!("fixtures/helpers_c5.rs"); - let c6 = include_bytes!("fixtures/helpers_c6.rs"); + let c1 = include_bytes!("../fixtures/helpers_c1.rs"); + let c5 = include_bytes!("../fixtures/helpers_c5.rs"); + let c6 = include_bytes!("../fixtures/helpers_c6.rs"); let root = tempfile::tempdir().unwrap().keep(); let home = tempfile::tempdir().unwrap().keep(); diff --git a/atomic-cli/tests/git_import_path_audit_test.rs b/atomic-cli/tests/it/git_import_path_audit_test.rs similarity index 100% rename from atomic-cli/tests/git_import_path_audit_test.rs rename to atomic-cli/tests/it/git_import_path_audit_test.rs diff --git a/atomic-cli/tests/git_import_sibling_closure_regression.rs b/atomic-cli/tests/it/git_import_sibling_closure_regression.rs similarity index 100% rename from atomic-cli/tests/git_import_sibling_closure_regression.rs rename to atomic-cli/tests/it/git_import_sibling_closure_regression.rs diff --git a/atomic-cli/tests/git_import_sibling_leg_modify_regression.rs b/atomic-cli/tests/it/git_import_sibling_leg_modify_regression.rs similarity index 100% rename from atomic-cli/tests/git_import_sibling_leg_modify_regression.rs rename to atomic-cli/tests/it/git_import_sibling_leg_modify_regression.rs diff --git a/atomic-cli/tests/git_import_stale_edge_dead_walk_regression.rs b/atomic-cli/tests/it/git_import_stale_edge_dead_walk_regression.rs similarity index 100% rename from atomic-cli/tests/git_import_stale_edge_dead_walk_regression.rs rename to atomic-cli/tests/it/git_import_stale_edge_dead_walk_regression.rs diff --git a/atomic-cli/tests/git_import_tracked_vault_regression.rs b/atomic-cli/tests/it/git_import_tracked_vault_regression.rs similarity index 100% rename from atomic-cli/tests/git_import_tracked_vault_regression.rs rename to atomic-cli/tests/it/git_import_tracked_vault_regression.rs diff --git a/atomic-cli/tests/git_import_tree_shape_regression.rs b/atomic-cli/tests/it/git_import_tree_shape_regression.rs similarity index 100% rename from atomic-cli/tests/git_import_tree_shape_regression.rs rename to atomic-cli/tests/it/git_import_tree_shape_regression.rs diff --git a/atomic-cli/tests/git_observation_cb0a_test.rs b/atomic-cli/tests/it/git_observation_cb0a_test.rs similarity index 100% rename from atomic-cli/tests/git_observation_cb0a_test.rs rename to atomic-cli/tests/it/git_observation_cb0a_test.rs diff --git a/atomic-cli/tests/git_projection_cb8a_test.rs b/atomic-cli/tests/it/git_projection_cb8a_test.rs similarity index 100% rename from atomic-cli/tests/git_projection_cb8a_test.rs rename to atomic-cli/tests/it/git_projection_cb8a_test.rs diff --git a/atomic-cli/tests/git_push_cb4b_test.rs b/atomic-cli/tests/it/git_push_cb4b_test.rs similarity index 100% rename from atomic-cli/tests/git_push_cb4b_test.rs rename to atomic-cli/tests/it/git_push_cb4b_test.rs diff --git a/atomic-cli/tests/git_shim_branch_reconcile_regression.rs b/atomic-cli/tests/it/git_shim_branch_reconcile_regression.rs similarity index 100% rename from atomic-cli/tests/git_shim_branch_reconcile_regression.rs rename to atomic-cli/tests/it/git_shim_branch_reconcile_regression.rs diff --git a/atomic-cli/tests/git_shim_cb0d_test.rs b/atomic-cli/tests/it/git_shim_cb0d_test.rs similarity index 100% rename from atomic-cli/tests/git_shim_cb0d_test.rs rename to atomic-cli/tests/it/git_shim_cb0d_test.rs diff --git a/atomic-cli/tests/git_shim_cb10a_test.rs b/atomic-cli/tests/it/git_shim_cb10a_test.rs similarity index 100% rename from atomic-cli/tests/git_shim_cb10a_test.rs rename to atomic-cli/tests/it/git_shim_cb10a_test.rs diff --git a/atomic-cli/tests/git_shim_cb13d_test.rs b/atomic-cli/tests/it/git_shim_cb13d_test.rs similarity index 100% rename from atomic-cli/tests/git_shim_cb13d_test.rs rename to atomic-cli/tests/it/git_shim_cb13d_test.rs diff --git a/atomic-cli/tests/git_shim_daily_workflow_regression.rs b/atomic-cli/tests/it/git_shim_daily_workflow_regression.rs similarity index 100% rename from atomic-cli/tests/git_shim_daily_workflow_regression.rs rename to atomic-cli/tests/it/git_shim_daily_workflow_regression.rs diff --git a/atomic-cli/tests/git_shim_logging_test.rs b/atomic-cli/tests/it/git_shim_logging_test.rs similarity index 100% rename from atomic-cli/tests/git_shim_logging_test.rs rename to atomic-cli/tests/it/git_shim_logging_test.rs diff --git a/atomic-cli/tests/git_shim_opt_in_test.rs b/atomic-cli/tests/it/git_shim_opt_in_test.rs similarity index 100% rename from atomic-cli/tests/git_shim_opt_in_test.rs rename to atomic-cli/tests/it/git_shim_opt_in_test.rs diff --git a/atomic-cli/tests/git_shim_workspace_test.rs b/atomic-cli/tests/it/git_shim_workspace_test.rs similarity index 100% rename from atomic-cli/tests/git_shim_workspace_test.rs rename to atomic-cli/tests/it/git_shim_workspace_test.rs diff --git a/atomic-cli/tests/git_transport_cb10b_test.rs b/atomic-cli/tests/it/git_transport_cb10b_test.rs similarity index 100% rename from atomic-cli/tests/git_transport_cb10b_test.rs rename to atomic-cli/tests/it/git_transport_cb10b_test.rs diff --git a/atomic-cli/tests/git_wip_cb0b_test.rs b/atomic-cli/tests/it/git_wip_cb0b_test.rs similarity index 99% rename from atomic-cli/tests/git_wip_cb0b_test.rs rename to atomic-cli/tests/it/git_wip_cb0b_test.rs index e52209dc..f001fa02 100644 --- a/atomic-cli/tests/git_wip_cb0b_test.rs +++ b/atomic-cli/tests/it/git_wip_cb0b_test.rs @@ -1,4 +1,4 @@ -#[path = "../src/commands/git/wip.rs"] +#[path = "../../src/commands/git/wip.rs"] mod wip; use std::collections::BTreeSet; diff --git a/atomic-cli/tests/graph_only_export_cb9b_test.rs b/atomic-cli/tests/it/graph_only_export_cb9b_test.rs similarity index 100% rename from atomic-cli/tests/graph_only_export_cb9b_test.rs rename to atomic-cli/tests/it/graph_only_export_cb9b_test.rs diff --git a/atomic-cli/tests/hook_health_integration_test.rs b/atomic-cli/tests/it/hook_health_integration_test.rs similarity index 100% rename from atomic-cli/tests/hook_health_integration_test.rs rename to atomic-cli/tests/it/hook_health_integration_test.rs diff --git a/atomic-cli/tests/ide_json_integration_test.rs b/atomic-cli/tests/it/ide_json_integration_test.rs similarity index 100% rename from atomic-cli/tests/ide_json_integration_test.rs rename to atomic-cli/tests/it/ide_json_integration_test.rs diff --git a/atomic-cli/tests/import_budget_100k_bench.rs b/atomic-cli/tests/it/import_budget_100k_bench.rs similarity index 99% rename from atomic-cli/tests/import_budget_100k_bench.rs rename to atomic-cli/tests/it/import_budget_100k_bench.rs index 3be56fca..1c64992e 100644 --- a/atomic-cli/tests/import_budget_100k_bench.rs +++ b/atomic-cli/tests/it/import_budget_100k_bench.rs @@ -10,7 +10,7 @@ //! ```text //! TMPDIR=/home/aaron/code/work/atomic/target/bench-tmp \ //! cargo test -p atomic-cli --release \ -//! --test import_budget_100k_bench -- --ignored --nocapture +//! --test it -- import_budget_100k_bench:: --ignored --nocapture //! ``` //! //! The run prints the measured wall-clock numbers and the environment diff --git a/atomic-cli/tests/insert_promote_integration_test.rs b/atomic-cli/tests/it/insert_promote_integration_test.rs similarity index 100% rename from atomic-cli/tests/insert_promote_integration_test.rs rename to atomic-cli/tests/it/insert_promote_integration_test.rs diff --git a/atomic-cli/tests/intent_attest_external_signer_test.rs b/atomic-cli/tests/it/intent_attest_external_signer_test.rs similarity index 100% rename from atomic-cli/tests/intent_attest_external_signer_test.rs rename to atomic-cli/tests/it/intent_attest_external_signer_test.rs diff --git a/atomic-cli/tests/intent_graph_test.rs b/atomic-cli/tests/it/intent_graph_test.rs similarity index 99% rename from atomic-cli/tests/intent_graph_test.rs rename to atomic-cli/tests/it/intent_graph_test.rs index 07c16a93..8fd2733d 100644 --- a/atomic-cli/tests/intent_graph_test.rs +++ b/atomic-cli/tests/it/intent_graph_test.rs @@ -249,7 +249,7 @@ fn exported_graph_canvas_selection_drag_zoom_and_responsive_layout() { "", &format!( "", - include_str!("fixtures/graph_canvas_test.js") + include_str!("../fixtures/graph_canvas_test.js") ), ); let path = directory.path().join("canvas-inspector.html"); diff --git a/atomic-cli/tests/intent_turn_binding_test.rs b/atomic-cli/tests/it/intent_turn_binding_test.rs similarity index 100% rename from atomic-cli/tests/intent_turn_binding_test.rs rename to atomic-cli/tests/it/intent_turn_binding_test.rs diff --git a/atomic-cli/tests/kg_service_integration_test.rs b/atomic-cli/tests/it/kg_service_integration_test.rs similarity index 100% rename from atomic-cli/tests/kg_service_integration_test.rs rename to atomic-cli/tests/it/kg_service_integration_test.rs diff --git a/atomic-cli/tests/logging_integration_test.rs b/atomic-cli/tests/it/logging_integration_test.rs similarity index 100% rename from atomic-cli/tests/logging_integration_test.rs rename to atomic-cli/tests/it/logging_integration_test.rs diff --git a/atomic-cli/tests/it/main.rs b/atomic-cli/tests/it/main.rs new file mode 100644 index 00000000..2dbc5a1e --- /dev/null +++ b/atomic-cli/tests/it/main.rs @@ -0,0 +1,88 @@ +//! All atomic-cli integration tests, built as one binary so the workspace is +//! linked once instead of once per file. Each module is a former +//! `tests/.rs`; run one with `cargo test -p atomic-cli --test it ::`. +//! +//! `provenance_rpc_sink` stays its own binary: it sets process env vars +//! (`ATOMIC_SERVICE`, `ATOMIC_DAEMON_SOCKET`) that every `atomic` subprocess +//! spawned by a concurrently running test in this binary would inherit. + +mod adaptation_regression_test; +mod agent_capture_oracle_cb12a_test; +mod agent_error_integration_test; +mod agent_repair_cb12a_test; +mod bridge_agent_workflow_regression_test; +mod build_version_integration_test; +mod change_ledger_integration_test; +mod change_tree_test; +mod cli_surface_integration_test; +mod clone_sidecar_integration_test; +mod compact_service_integration_test; +mod concurrent_intent_reads_test; +mod cross_stream_matrix_test; +mod git_adoption_cb7b_test; +mod git_anchor_cb7a_test; +mod git_binding_cb6a_test; +mod git_binding_cb6b_test; +mod git_binding_cb6c_test; +mod git_bridge_reconcile_preserved_delete_test; +mod git_cutover_cb13b_test; +mod git_guard_cb0c_test; +mod git_import_bypass_cycle_regression; +mod git_import_cb9a_test; +mod git_import_cb9b_test; +mod git_import_cb9c_test; +mod git_import_corpus_regression_test; +mod git_import_generated_modify_test; +mod git_import_path_audit_test; +mod git_import_sibling_closure_regression; +mod git_import_sibling_leg_modify_regression; +mod git_import_stale_edge_dead_walk_regression; +mod git_import_tracked_vault_regression; +mod git_import_tree_shape_regression; +mod git_observation_cb0a_test; +mod git_projection_cb8a_test; +mod git_push_cb4b_test; +mod git_shim_branch_reconcile_regression; +mod git_shim_cb0d_test; +mod git_shim_cb10a_test; +mod git_shim_cb13d_test; +mod git_shim_daily_workflow_regression; +mod git_shim_logging_test; +mod git_shim_opt_in_test; +mod git_shim_workspace_test; +mod git_transport_cb10b_test; +mod git_wip_cb0b_test; +mod graph_only_export_cb9b_test; +mod hook_health_integration_test; +mod ide_json_integration_test; +mod import_budget_100k_bench; +mod insert_promote_integration_test; +mod intent_attest_external_signer_test; +mod intent_graph_test; +mod intent_turn_binding_test; +mod kg_service_integration_test; +mod logging_integration_test; +mod memory_compatibility_test; +mod native_index_doctor_integration_test; +mod native_view_materialization_regression_test; +mod operation_cli_integration_test; +mod provenance_integration_test; +mod push_integration_test; +mod record_rename_attributes_test; +mod record_stale_conflict_cleanup_test; +mod remote_sandbox_client_test; +mod remove_recorded_path_test; +mod repository_discovery_integration_test; +mod restore_integration_test; +mod routing_parity_test; +mod session_integration_test; +mod shim_census_cb13a_test; +mod status_git_cb11a_test; +mod unrecord_integration_test; +mod vault_context_integration_test; +mod view_confirmation_integration_test; +mod working_copy_preservation_test; +mod working_copy_service_adaptation_test; +mod workspace_txn_boundaries_cb5c_test; +mod workspace_txn_routing_cb5b_test; +mod workspace_txn_routing_cb5c_test; diff --git a/atomic-cli/tests/memory_compatibility_test.rs b/atomic-cli/tests/it/memory_compatibility_test.rs similarity index 100% rename from atomic-cli/tests/memory_compatibility_test.rs rename to atomic-cli/tests/it/memory_compatibility_test.rs diff --git a/atomic-cli/tests/native_index_doctor_integration_test.rs b/atomic-cli/tests/it/native_index_doctor_integration_test.rs similarity index 100% rename from atomic-cli/tests/native_index_doctor_integration_test.rs rename to atomic-cli/tests/it/native_index_doctor_integration_test.rs diff --git a/atomic-cli/tests/native_view_materialization_regression_test.rs b/atomic-cli/tests/it/native_view_materialization_regression_test.rs similarity index 100% rename from atomic-cli/tests/native_view_materialization_regression_test.rs rename to atomic-cli/tests/it/native_view_materialization_regression_test.rs diff --git a/atomic-cli/tests/operation_cli_integration_test.rs b/atomic-cli/tests/it/operation_cli_integration_test.rs similarity index 100% rename from atomic-cli/tests/operation_cli_integration_test.rs rename to atomic-cli/tests/it/operation_cli_integration_test.rs diff --git a/atomic-cli/tests/provenance_integration_test.rs b/atomic-cli/tests/it/provenance_integration_test.rs similarity index 100% rename from atomic-cli/tests/provenance_integration_test.rs rename to atomic-cli/tests/it/provenance_integration_test.rs diff --git a/atomic-cli/tests/push_integration_test.rs b/atomic-cli/tests/it/push_integration_test.rs similarity index 100% rename from atomic-cli/tests/push_integration_test.rs rename to atomic-cli/tests/it/push_integration_test.rs diff --git a/atomic-cli/tests/record_rename_attributes_test.rs b/atomic-cli/tests/it/record_rename_attributes_test.rs similarity index 100% rename from atomic-cli/tests/record_rename_attributes_test.rs rename to atomic-cli/tests/it/record_rename_attributes_test.rs diff --git a/atomic-cli/tests/record_stale_conflict_cleanup_test.rs b/atomic-cli/tests/it/record_stale_conflict_cleanup_test.rs similarity index 100% rename from atomic-cli/tests/record_stale_conflict_cleanup_test.rs rename to atomic-cli/tests/it/record_stale_conflict_cleanup_test.rs diff --git a/atomic-cli/tests/remote_sandbox_client_test.rs b/atomic-cli/tests/it/remote_sandbox_client_test.rs similarity index 100% rename from atomic-cli/tests/remote_sandbox_client_test.rs rename to atomic-cli/tests/it/remote_sandbox_client_test.rs diff --git a/atomic-cli/tests/remove_recorded_path_test.rs b/atomic-cli/tests/it/remove_recorded_path_test.rs similarity index 100% rename from atomic-cli/tests/remove_recorded_path_test.rs rename to atomic-cli/tests/it/remove_recorded_path_test.rs diff --git a/atomic-cli/tests/repository_discovery_integration_test.rs b/atomic-cli/tests/it/repository_discovery_integration_test.rs similarity index 100% rename from atomic-cli/tests/repository_discovery_integration_test.rs rename to atomic-cli/tests/it/repository_discovery_integration_test.rs diff --git a/atomic-cli/tests/restore_integration_test.rs b/atomic-cli/tests/it/restore_integration_test.rs similarity index 100% rename from atomic-cli/tests/restore_integration_test.rs rename to atomic-cli/tests/it/restore_integration_test.rs diff --git a/atomic-cli/tests/routing_parity_test.rs b/atomic-cli/tests/it/routing_parity_test.rs similarity index 100% rename from atomic-cli/tests/routing_parity_test.rs rename to atomic-cli/tests/it/routing_parity_test.rs diff --git a/atomic-cli/tests/session_integration_test.rs b/atomic-cli/tests/it/session_integration_test.rs similarity index 100% rename from atomic-cli/tests/session_integration_test.rs rename to atomic-cli/tests/it/session_integration_test.rs diff --git a/atomic-cli/tests/shim_census_cb13a_test.rs b/atomic-cli/tests/it/shim_census_cb13a_test.rs similarity index 100% rename from atomic-cli/tests/shim_census_cb13a_test.rs rename to atomic-cli/tests/it/shim_census_cb13a_test.rs diff --git a/atomic-cli/tests/status_git_cb11a_test.rs b/atomic-cli/tests/it/status_git_cb11a_test.rs similarity index 100% rename from atomic-cli/tests/status_git_cb11a_test.rs rename to atomic-cli/tests/it/status_git_cb11a_test.rs diff --git a/atomic-cli/tests/unrecord_integration_test.rs b/atomic-cli/tests/it/unrecord_integration_test.rs similarity index 100% rename from atomic-cli/tests/unrecord_integration_test.rs rename to atomic-cli/tests/it/unrecord_integration_test.rs diff --git a/atomic-cli/tests/vault_context_integration_test.rs b/atomic-cli/tests/it/vault_context_integration_test.rs similarity index 100% rename from atomic-cli/tests/vault_context_integration_test.rs rename to atomic-cli/tests/it/vault_context_integration_test.rs diff --git a/atomic-cli/tests/view_confirmation_integration_test.rs b/atomic-cli/tests/it/view_confirmation_integration_test.rs similarity index 100% rename from atomic-cli/tests/view_confirmation_integration_test.rs rename to atomic-cli/tests/it/view_confirmation_integration_test.rs diff --git a/atomic-cli/tests/working_copy_preservation_test.rs b/atomic-cli/tests/it/working_copy_preservation_test.rs similarity index 100% rename from atomic-cli/tests/working_copy_preservation_test.rs rename to atomic-cli/tests/it/working_copy_preservation_test.rs diff --git a/atomic-cli/tests/working_copy_service_adaptation_test.rs b/atomic-cli/tests/it/working_copy_service_adaptation_test.rs similarity index 100% rename from atomic-cli/tests/working_copy_service_adaptation_test.rs rename to atomic-cli/tests/it/working_copy_service_adaptation_test.rs diff --git a/atomic-cli/tests/workspace_txn_boundaries_cb5c_test.rs b/atomic-cli/tests/it/workspace_txn_boundaries_cb5c_test.rs similarity index 100% rename from atomic-cli/tests/workspace_txn_boundaries_cb5c_test.rs rename to atomic-cli/tests/it/workspace_txn_boundaries_cb5c_test.rs diff --git a/atomic-cli/tests/workspace_txn_routing_cb5b_test.rs b/atomic-cli/tests/it/workspace_txn_routing_cb5b_test.rs similarity index 100% rename from atomic-cli/tests/workspace_txn_routing_cb5b_test.rs rename to atomic-cli/tests/it/workspace_txn_routing_cb5b_test.rs diff --git a/atomic-cli/tests/workspace_txn_routing_cb5c_test.rs b/atomic-cli/tests/it/workspace_txn_routing_cb5c_test.rs similarity index 100% rename from atomic-cli/tests/workspace_txn_routing_cb5c_test.rs rename to atomic-cli/tests/it/workspace_txn_routing_cb5c_test.rs diff --git a/atomic-repository/tests/causal_file_identity_test.rs b/atomic-repository/tests/it/causal_file_identity_test.rs similarity index 100% rename from atomic-repository/tests/causal_file_identity_test.rs rename to atomic-repository/tests/it/causal_file_identity_test.rs diff --git a/atomic-repository/tests/cb_n6_merge_rubric_test.rs b/atomic-repository/tests/it/cb_n6_merge_rubric_test.rs similarity index 100% rename from atomic-repository/tests/cb_n6_merge_rubric_test.rs rename to atomic-repository/tests/it/cb_n6_merge_rubric_test.rs diff --git a/atomic-repository/tests/change_signing_test.rs b/atomic-repository/tests/it/change_signing_test.rs similarity index 100% rename from atomic-repository/tests/change_signing_test.rs rename to atomic-repository/tests/it/change_signing_test.rs diff --git a/atomic-repository/tests/content_roundtrip_fidelity_test.rs b/atomic-repository/tests/it/content_roundtrip_fidelity_test.rs similarity index 99% rename from atomic-repository/tests/content_roundtrip_fidelity_test.rs rename to atomic-repository/tests/it/content_roundtrip_fidelity_test.rs index 2e35fad3..60d4d9b1 100644 --- a/atomic-repository/tests/content_roundtrip_fidelity_test.rs +++ b/atomic-repository/tests/it/content_roundtrip_fidelity_test.rs @@ -1422,19 +1422,19 @@ fn hyperfine_fixture_versions() -> [(&'static str, &'static [u8]); 4] { [ ( "a658ab8c", - include_bytes!("fixtures/hyperfine/a658ab8c_main.rs"), + include_bytes!("../fixtures/hyperfine/a658ab8c_main.rs"), ), ( "d4ebdd7b", - include_bytes!("fixtures/hyperfine/d4ebdd7b_main.rs"), + include_bytes!("../fixtures/hyperfine/d4ebdd7b_main.rs"), ), ( "197f9fb", - include_bytes!("fixtures/hyperfine/197f9fb_main.rs"), + include_bytes!("../fixtures/hyperfine/197f9fb_main.rs"), ), ( "68fdc2c", - include_bytes!("fixtures/hyperfine/68fdc2c_main.rs"), + include_bytes!("../fixtures/hyperfine/68fdc2c_main.rs"), ), ] } diff --git a/atomic-repository/tests/database_consolidation_shim_test.rs b/atomic-repository/tests/it/database_consolidation_shim_test.rs similarity index 100% rename from atomic-repository/tests/database_consolidation_shim_test.rs rename to atomic-repository/tests/it/database_consolidation_shim_test.rs diff --git a/atomic-repository/tests/database_lock_exclusivity_test.rs b/atomic-repository/tests/it/database_lock_exclusivity_test.rs similarity index 93% rename from atomic-repository/tests/database_lock_exclusivity_test.rs rename to atomic-repository/tests/it/database_lock_exclusivity_test.rs index 27d8d3c0..d32c3b7c 100644 --- a/atomic-repository/tests/database_lock_exclusivity_test.rs +++ b/atomic-repository/tests/it/database_lock_exclusivity_test.rs @@ -12,6 +12,14 @@ const CHILD_ROOT: &str = "ATOMIC_DATABASE_LOCK_ROOT"; const CHILD_REPORT: &str = "ATOMIC_DATABASE_LOCK_REPORT"; const CHILD_TEST: &str = "database_handles_exclude_incompatible_opens_across_processes"; +/// libtest's name for the child test: its module path without the crate name. +fn child_test_name() -> String { + match module_path!().split_once("::") { + Some((_, module)) => format!("{module}::{CHILD_TEST}"), + None => CHILD_TEST.to_string(), + } +} + fn probe(root: &Path) -> String { let readonly = match Repository::open_readonly_wait(root, Duration::ZERO) { Ok(_) => "readonly-ok".to_string(), @@ -39,7 +47,7 @@ fn probe(root: &Path) -> String { fn child_probe(root: &Path, report_path: &Path) -> String { let mut child = Command::new(std::env::current_exe().expect("test binary path")) - .args(["--exact", CHILD_TEST, "--test-threads=1"]) + .args(["--exact", &child_test_name(), "--test-threads=1"]) .env(CHILD_ROOT, root) .env(CHILD_REPORT, report_path) .stdout(Stdio::piped()) diff --git a/atomic-repository/tests/database_open_wait_test.rs b/atomic-repository/tests/it/database_open_wait_test.rs similarity index 100% rename from atomic-repository/tests/database_open_wait_test.rs rename to atomic-repository/tests/it/database_open_wait_test.rs diff --git a/atomic-repository/tests/effective_history_test.rs b/atomic-repository/tests/it/effective_history_test.rs similarity index 100% rename from atomic-repository/tests/effective_history_test.rs rename to atomic-repository/tests/it/effective_history_test.rs diff --git a/atomic-repository/tests/effective_projection_3b_test.rs b/atomic-repository/tests/it/effective_projection_3b_test.rs similarity index 100% rename from atomic-repository/tests/effective_projection_3b_test.rs rename to atomic-repository/tests/it/effective_projection_3b_test.rs diff --git a/atomic-repository/tests/equivalence_cb4b_test.rs b/atomic-repository/tests/it/equivalence_cb4b_test.rs similarity index 100% rename from atomic-repository/tests/equivalence_cb4b_test.rs rename to atomic-repository/tests/it/equivalence_cb4b_test.rs diff --git a/atomic-repository/tests/implementation_declaration.rs b/atomic-repository/tests/it/implementation_declaration.rs similarity index 100% rename from atomic-repository/tests/implementation_declaration.rs rename to atomic-repository/tests/it/implementation_declaration.rs diff --git a/atomic-repository/tests/intent_graph.rs b/atomic-repository/tests/it/intent_graph.rs similarity index 100% rename from atomic-repository/tests/intent_graph.rs rename to atomic-repository/tests/it/intent_graph.rs diff --git a/atomic-repository/tests/kg_change_availability.rs b/atomic-repository/tests/it/kg_change_availability.rs similarity index 100% rename from atomic-repository/tests/kg_change_availability.rs rename to atomic-repository/tests/it/kg_change_availability.rs diff --git a/atomic-repository/tests/kg_projection.rs b/atomic-repository/tests/it/kg_projection.rs similarity index 100% rename from atomic-repository/tests/kg_projection.rs rename to atomic-repository/tests/it/kg_projection.rs diff --git a/atomic-repository/tests/kg_recorded_impact.rs b/atomic-repository/tests/it/kg_recorded_impact.rs similarity index 100% rename from atomic-repository/tests/kg_recorded_impact.rs rename to atomic-repository/tests/it/kg_recorded_impact.rs diff --git a/atomic-repository/tests/legacy_database_merge_test.rs b/atomic-repository/tests/it/legacy_database_merge_test.rs similarity index 100% rename from atomic-repository/tests/legacy_database_merge_test.rs rename to atomic-repository/tests/it/legacy_database_merge_test.rs diff --git a/atomic-repository/tests/it/main.rs b/atomic-repository/tests/it/main.rs new file mode 100644 index 00000000..52c04f26 --- /dev/null +++ b/atomic-repository/tests/it/main.rs @@ -0,0 +1,41 @@ +//! All atomic-repository integration tests, built as one binary so the workspace is +//! linked once instead of once per file. Each module is a former +//! `tests/.rs`; run one with `cargo test -p atomic-repository --test it ::`. + +mod causal_file_identity_test; +mod cb_n6_merge_rubric_test; +mod change_signing_test; +mod content_roundtrip_fidelity_test; +mod database_consolidation_shim_test; +mod database_lock_exclusivity_test; +mod database_open_wait_test; +mod effective_history_test; +mod effective_projection_3b_test; +mod equivalence_cb4b_test; +mod implementation_declaration; +mod intent_graph; +mod kg_change_availability; +mod kg_projection; +mod kg_recorded_impact; +mod legacy_database_merge_test; +mod materialize_view_entries_test; +mod migration_recovery_test; +mod patch_evidence; +mod project_identity; +mod project_identity_transport; +mod project_tree_cb4a_test; +mod provenance_checkpoint_test; +mod remote_cache_parity_test; +mod revise_content_regression; +mod schema_guard_test; +mod staging_cb11a_test; +mod stash_attributes_test; +mod state_based_diff_test; +mod unrecord_safety_test; +mod view_delete_test; +mod view_manifest_test; +mod view_setid_test; +mod view_split_test; +mod whole_file_diff_test; +mod workflow_usage; +mod zero_length_vertex_regression_test; diff --git a/atomic-repository/tests/materialize_view_entries_test.rs b/atomic-repository/tests/it/materialize_view_entries_test.rs similarity index 100% rename from atomic-repository/tests/materialize_view_entries_test.rs rename to atomic-repository/tests/it/materialize_view_entries_test.rs diff --git a/atomic-repository/tests/migration_recovery_test.rs b/atomic-repository/tests/it/migration_recovery_test.rs similarity index 100% rename from atomic-repository/tests/migration_recovery_test.rs rename to atomic-repository/tests/it/migration_recovery_test.rs diff --git a/atomic-repository/tests/patch_evidence.rs b/atomic-repository/tests/it/patch_evidence.rs similarity index 100% rename from atomic-repository/tests/patch_evidence.rs rename to atomic-repository/tests/it/patch_evidence.rs diff --git a/atomic-repository/tests/project_identity.rs b/atomic-repository/tests/it/project_identity.rs similarity index 100% rename from atomic-repository/tests/project_identity.rs rename to atomic-repository/tests/it/project_identity.rs diff --git a/atomic-repository/tests/project_identity_transport.rs b/atomic-repository/tests/it/project_identity_transport.rs similarity index 100% rename from atomic-repository/tests/project_identity_transport.rs rename to atomic-repository/tests/it/project_identity_transport.rs diff --git a/atomic-repository/tests/project_tree_cb4a_test.rs b/atomic-repository/tests/it/project_tree_cb4a_test.rs similarity index 100% rename from atomic-repository/tests/project_tree_cb4a_test.rs rename to atomic-repository/tests/it/project_tree_cb4a_test.rs diff --git a/atomic-repository/tests/provenance_checkpoint_test.rs b/atomic-repository/tests/it/provenance_checkpoint_test.rs similarity index 100% rename from atomic-repository/tests/provenance_checkpoint_test.rs rename to atomic-repository/tests/it/provenance_checkpoint_test.rs diff --git a/atomic-repository/tests/remote_cache_parity_test.rs b/atomic-repository/tests/it/remote_cache_parity_test.rs similarity index 100% rename from atomic-repository/tests/remote_cache_parity_test.rs rename to atomic-repository/tests/it/remote_cache_parity_test.rs diff --git a/atomic-repository/tests/revise_content_regression.rs b/atomic-repository/tests/it/revise_content_regression.rs similarity index 100% rename from atomic-repository/tests/revise_content_regression.rs rename to atomic-repository/tests/it/revise_content_regression.rs diff --git a/atomic-repository/tests/schema_guard_test.rs b/atomic-repository/tests/it/schema_guard_test.rs similarity index 100% rename from atomic-repository/tests/schema_guard_test.rs rename to atomic-repository/tests/it/schema_guard_test.rs diff --git a/atomic-repository/tests/staging_cb11a_test.rs b/atomic-repository/tests/it/staging_cb11a_test.rs similarity index 100% rename from atomic-repository/tests/staging_cb11a_test.rs rename to atomic-repository/tests/it/staging_cb11a_test.rs diff --git a/atomic-repository/tests/stash_attributes_test.rs b/atomic-repository/tests/it/stash_attributes_test.rs similarity index 100% rename from atomic-repository/tests/stash_attributes_test.rs rename to atomic-repository/tests/it/stash_attributes_test.rs diff --git a/atomic-repository/tests/state_based_diff_test.rs b/atomic-repository/tests/it/state_based_diff_test.rs similarity index 100% rename from atomic-repository/tests/state_based_diff_test.rs rename to atomic-repository/tests/it/state_based_diff_test.rs diff --git a/atomic-repository/tests/unrecord_safety_test.rs b/atomic-repository/tests/it/unrecord_safety_test.rs similarity index 100% rename from atomic-repository/tests/unrecord_safety_test.rs rename to atomic-repository/tests/it/unrecord_safety_test.rs diff --git a/atomic-repository/tests/view_delete_test.rs b/atomic-repository/tests/it/view_delete_test.rs similarity index 100% rename from atomic-repository/tests/view_delete_test.rs rename to atomic-repository/tests/it/view_delete_test.rs diff --git a/atomic-repository/tests/view_manifest_test.rs b/atomic-repository/tests/it/view_manifest_test.rs similarity index 100% rename from atomic-repository/tests/view_manifest_test.rs rename to atomic-repository/tests/it/view_manifest_test.rs diff --git a/atomic-repository/tests/view_setid_test.rs b/atomic-repository/tests/it/view_setid_test.rs similarity index 100% rename from atomic-repository/tests/view_setid_test.rs rename to atomic-repository/tests/it/view_setid_test.rs diff --git a/atomic-repository/tests/view_split_test.rs b/atomic-repository/tests/it/view_split_test.rs similarity index 100% rename from atomic-repository/tests/view_split_test.rs rename to atomic-repository/tests/it/view_split_test.rs diff --git a/atomic-repository/tests/whole_file_diff_test.rs b/atomic-repository/tests/it/whole_file_diff_test.rs similarity index 100% rename from atomic-repository/tests/whole_file_diff_test.rs rename to atomic-repository/tests/it/whole_file_diff_test.rs diff --git a/atomic-repository/tests/workflow_usage.rs b/atomic-repository/tests/it/workflow_usage.rs similarity index 100% rename from atomic-repository/tests/workflow_usage.rs rename to atomic-repository/tests/it/workflow_usage.rs diff --git a/atomic-repository/tests/zero_length_vertex_regression_test.rs b/atomic-repository/tests/it/zero_length_vertex_regression_test.rs similarity index 100% rename from atomic-repository/tests/zero_length_vertex_regression_test.rs rename to atomic-repository/tests/it/zero_length_vertex_regression_test.rs diff --git a/docs/intent-graph.md b/docs/intent-graph.md index abc02da9..579f81b6 100644 --- a/docs/intent-graph.md +++ b/docs/intent-graph.md @@ -86,7 +86,7 @@ Browser interaction regressions can be run explicitly with Chrome/Chromium: ```sh ATOMIC_TEST_CHROME=/path/to/chrome \ - cargo test -p atomic-cli --test intent_graph_test -- --ignored + cargo test -p atomic-cli --test it -- intent_graph_test:: --ignored ``` Set `ATOMIC_TEST_D3=/path/to/d3.min.js` to use a local D3 v7 bundle for the canvas diff --git a/docs/provenance-pagination.md b/docs/provenance-pagination.md index 11161e7c..9c8b7545 100644 --- a/docs/provenance-pagination.md +++ b/docs/provenance-pagination.md @@ -50,8 +50,8 @@ multiple pages. ```sh cargo test -p atomic-cli --bin atomic commands::agent::owner::tests -cargo test -p atomic-repository --test provenance_checkpoint_test -cargo test -p atomic-cli --test database_owner_integration_test +cargo test -p atomic-repository --test it -- provenance_checkpoint_test:: +cargo test -p atomic-cli --test it -- database_owner_integration_test:: cargo test --workspace ``` diff --git a/docs/record-status-name-conflict.md b/docs/record-status-name-conflict.md index f40ea4eb..fcb6c201 100644 --- a/docs/record-status-name-conflict.md +++ b/docs/record-status-name-conflict.md @@ -107,7 +107,7 @@ inode. Removing and re-adding the file is unnecessary. cargo build -p atomic-cli --release ATOMIC_BIN="$PWD/target/release/atomic" bash tests/harness/run_all.sh 39 41 cargo test -p atomic-core -p atomic-repository --lib -cargo test -p atomic-repository --test causal_file_identity_test +cargo test -p atomic-repository --test it -- causal_file_identity_test:: ``` Suite 39 is the unchanged prior view-switch regression. Suite 41 adds the diff --git a/docs/shim-review-testing.md b/docs/shim-review-testing.md index 228f817a..1f1e4f83 100644 --- a/docs/shim-review-testing.md +++ b/docs/shim-review-testing.md @@ -204,25 +204,25 @@ Check failures and skipped tests in the output. ```sh cd "$ATOMIC_REVIEW_SOURCE" -cargo test --locked -p atomic-cli \ - --test adaptation_regression_test \ - --test git_shim_opt_in_test \ - --test git_shim_workspace_test \ - --test bridge_agent_workflow_regression_test \ - --test git_shim_logging_test - -cargo test --locked -p atomic-cli \ - --test working_copy_service_adaptation_test \ - --test compact_service_integration_test +cargo test --locked -p atomic-cli --test it -- \ + adaptation_regression_test:: \ + git_shim_opt_in_test:: \ + git_shim_workspace_test:: \ + bridge_agent_workflow_regression_test:: \ + git_shim_logging_test:: + +cargo test --locked -p atomic-cli --test it -- \ + working_copy_service_adaptation_test:: \ + compact_service_integration_test:: cargo test --locked -p libatomic \ --test record_service_test --test status_service_test --test sandbox_service_test -cargo test --locked -p atomic-repository \ - --test database_consolidation_shim_test --test migration_recovery_test +cargo test --locked -p atomic-repository --test it -- \ + database_consolidation_shim_test:: migration_recovery_test:: cargo test --locked -p atomic-cli \ - --features adoption-test-injection \ - --test git_shim_cb13d_test --test git_cutover_cb13b_test + --features adoption-test-injection --test it -- \ + git_shim_cb13d_test:: git_cutover_cb13b_test:: ``` `working_copy_service_adaptation_test` starts a real RPC server using this diff --git a/tests/harness/46_database_locking.sh b/tests/harness/46_database_locking.sh index 06165edc..06c5be79 100755 --- a/tests/harness/46_database_locking.sh +++ b/tests/harness/46_database_locking.sh @@ -79,21 +79,21 @@ run_check dependencies cargo tree --locked -p atomic-core --depth 1 if [[ "$full" -eq 1 ]]; then run_check pristine cargo test --locked -p atomic-core --lib pristine:: -- --test-threads=4 - run_check storage cargo test --locked -p atomic-core --test merge_test \ - -p atomic-repository --test database_lock_exclusivity_test \ - --test database_open_wait_test --test database_consolidation_bridge_test \ - --test legacy_database_merge_test --test schema_guard_test \ - --test provenance_checkpoint_test + run_check storage-core cargo test --locked -p atomic-core --test merge_test + run_check storage cargo test --locked -p atomic-repository --test it -- \ + database_lock_exclusivity_test:: database_open_wait_test:: \ + database_consolidation_shim_test:: legacy_database_merge_test:: \ + schema_guard_test:: provenance_checkpoint_test:: run_check libatomic cargo check --locked -p libatomic else run_check snapshots cargo test --locked -p atomic-core --lib \ pristine::txn::pristine::snapshot::tests run_check exclusion cargo test --locked -p atomic-repository \ - --test database_lock_exclusivity_test + --test it -- database_lock_exclusivity_test:: run_check lock-waits cargo test --locked -p atomic-repository \ - --test database_open_wait_test + --test it -- database_open_wait_test:: run_check provenance cargo test --locked -p atomic-repository \ - --test provenance_checkpoint_test + --test it -- provenance_checkpoint_test:: fi printf '\nChecks: %s passed, %s failed\nSummary: %s\n' "$passed" "$failed" "$summary" diff --git a/tests/harness/46_knowledge_graph_closure.sh b/tests/harness/46_knowledge_graph_closure.sh index 674b7315..4a8d0c2e 100644 --- a/tests/harness/46_knowledge_graph_closure.sh +++ b/tests/harness/46_knowledge_graph_closure.sh @@ -6,8 +6,13 @@ HARNESS_DIR="$(cd "$(dirname "$0")" && pwd)" source "$HARNESS_DIR/helpers.sh" python3 "$HARNESS_DIR/kg_closure_e2e.py" --binary "$ATOMIC_BIN" python3 "$HARNESS_DIR/kg_closure_baseline.py" --binary "$ATOMIC_BIN" --check +# CI already runs these suites in its workspace test step, and invoking them +# here with a different package/feature set rebuilds the crate graph. +if [[ "${ATOMIC_HARNESS_SKIP_CARGO_TESTS:-0}" == 1 ]]; then + exit 0 +fi cargo test --manifest-path "$HARNESS_DIR/../../Cargo.toml" -p atomic-core --test kg_ontology --test kg_iri --test kg_vocabulary_lint --quiet -cargo test --manifest-path "$HARNESS_DIR/../../Cargo.toml" -p atomic-repository --test project_identity --test kg_projection --quiet +cargo test --manifest-path "$HARNESS_DIR/../../Cargo.toml" -p atomic-repository --test it --quiet -- project_identity:: kg_projection:: cargo test --manifest-path "$HARNESS_DIR/../../Cargo.toml" -p atomic-shacl --quiet cargo test --manifest-path "$HARNESS_DIR/../../Cargo.toml" -p libatomic --test signer_refresh --quiet -cargo test --manifest-path "$HARNESS_DIR/../../Cargo.toml" -p atomic-cli --test kg_service_integration_test --quiet +cargo test --manifest-path "$HARNESS_DIR/../../Cargo.toml" -p atomic-cli --test it --quiet -- kg_service_integration_test::