Description: Disable network tests Author: Ximin Luo Forwarded: TODO --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: rust/src/tools/cargo/tests/testsuite/git_auth.rs =================================================================== --- rust.orig/src/tools/cargo/tests/testsuite/git_auth.rs +++ rust/src/tools/cargo/tests/testsuite/git_auth.rs @@ -103,7 +103,7 @@ fn setup_failed_auth_test() -> (SocketAd } // Tests that HTTP auth is offered from `credential.helper`. -#[cargo_test] +#[allow(dead_code)] fn http_auth_offered() { // TODO(Seb): remove this once possible. if cargo_uses_gitoxide() { @@ -172,7 +172,7 @@ Caused by: } // Boy, sure would be nice to have a TLS implementation in rust! -#[cargo_test] +#[allow(dead_code)] fn https_something_happens() { let server = TcpListener::bind("127.0.0.1:0").unwrap(); let addr = server.local_addr().unwrap(); Index: rust/src/tools/cargo/tests/testsuite/net_config.rs =================================================================== --- rust.orig/src/tools/cargo/tests/testsuite/net_config.rs +++ rust/src/tools/cargo/tests/testsuite/net_config.rs @@ -2,7 +2,7 @@ use cargo_test_support::project; -#[cargo_test] +#[allow(dead_code)] fn net_retry_loads_from_config() { let p = project() .file( @@ -38,7 +38,7 @@ fn net_retry_loads_from_config() { .run(); } -#[cargo_test] +#[allow(dead_code)] fn net_retry_git_outputs_warning() { let p = project() .file( Index: rust/src/tools/cargo/tests/testsuite/publish.rs =================================================================== --- rust.orig/src/tools/cargo/tests/testsuite/publish.rs +++ rust/src/tools/cargo/tests/testsuite/publish.rs @@ -88,7 +88,7 @@ fn validate_upload_li() { ); } -#[cargo_test] +#[allow(dead_code)] fn simple() { let registry = RegistryBuilder::new().http_api().http_index().build(); @@ -130,7 +130,7 @@ You may press ctrl-c to skip waiting; th // Check that the `token` key works at the root instead of under a // `[registry]` table. -#[cargo_test] +#[allow(dead_code)] fn simple_publish_with_http() { let _reg = registry::RegistryBuilder::new() .http_api() @@ -170,7 +170,7 @@ You may press ctrl-c to skip waiting; th .run(); } -#[cargo_test] +#[allow(dead_code)] fn simple_publish_with_asymmetric() { let _reg = registry::RegistryBuilder::new() .http_api() @@ -213,7 +213,7 @@ You may press ctrl-c to skip waiting; th .run(); } -#[cargo_test] +#[allow(dead_code)] fn old_token_location() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); @@ -270,7 +270,7 @@ You may press ctrl-c [..] // Other tests will verify the endpoint gets the right payload. } -#[cargo_test] +#[allow(dead_code)] fn simple_with_index() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); @@ -315,7 +315,7 @@ You may press ctrl-c [..] // Other tests will verify the endpoint gets the right payload. } -#[cargo_test] +#[allow(dead_code)] fn git_deps() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -353,7 +353,7 @@ the `git` specification will be removed .run(); } -#[cargo_test] +#[allow(dead_code)] fn path_dependency_no_version() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -393,7 +393,7 @@ the `path` specification will be removed .run(); } -#[cargo_test] +#[allow(dead_code)] fn unpublishable_crate() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -426,7 +426,7 @@ fn unpublishable_crate() { .run(); } -#[cargo_test] +#[allow(dead_code)] fn dont_publish_dirty() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -468,7 +468,7 @@ to proceed despite this and include the .run(); } -#[cargo_test] +#[allow(dead_code)] fn publish_clean() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); @@ -516,7 +516,7 @@ You may press ctrl-c to skip waiting; th // Other tests will verify the endpoint gets the right payload. } -#[cargo_test] +#[allow(dead_code)] fn publish_in_sub_repo() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); @@ -565,7 +565,7 @@ You may press ctrl-c [..] // Other tests will verify the endpoint gets the right payload. } -#[cargo_test] +#[allow(dead_code)] fn publish_when_ignored() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); @@ -614,7 +614,7 @@ You may press ctrl-c [..] // Other tests will verify the endpoint gets the right payload. } -#[cargo_test] +#[allow(dead_code)] fn ignore_when_crate_ignored() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); @@ -662,7 +662,7 @@ You may press ctrl-c [..] // Other tests will verify the endpoint gets the right payload. } -#[cargo_test] +#[allow(dead_code)] fn new_crate_rejected() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -695,7 +695,7 @@ fn new_crate_rejected() { .run(); } -#[cargo_test] +#[allow(dead_code)] fn dry_run() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -738,7 +738,7 @@ See [..] assert!(!registry::api_path().join("api/v1/crates/new").exists()); } -#[cargo_test] +#[allow(dead_code)] fn registry_not_in_publish_list() { let p = project() .file( @@ -771,7 +771,7 @@ The registry `alternative` is not listed .run(); } -#[cargo_test] +#[allow(dead_code)] fn publish_empty_list() { let p = project() .file( @@ -800,7 +800,7 @@ fn publish_empty_list() { .run(); } -#[cargo_test] +#[allow(dead_code)] fn publish_allowed_registry() { let _registry = RegistryBuilder::new() .http_api() @@ -860,7 +860,7 @@ You may press ctrl-c [..] ); } -#[cargo_test] +#[allow(dead_code)] fn publish_implicitly_to_only_allowed_registry() { let _registry = RegistryBuilder::new() .http_api() @@ -921,7 +921,7 @@ You may press ctrl-c [..] ); } -#[cargo_test] +#[allow(dead_code)] fn publish_fail_with_no_registry_specified() { let p = project().build(); @@ -955,7 +955,7 @@ The registry `crates-io` is not listed i .run(); } -#[cargo_test] +#[allow(dead_code)] fn block_publish_no_registry() { let p = project() .file( @@ -985,7 +985,7 @@ fn block_publish_no_registry() { } // Explicitly setting `crates-io` in the publish list. -#[cargo_test] +#[allow(dead_code)] fn publish_with_crates_io_explicit() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); @@ -1038,7 +1038,7 @@ You may press ctrl-c [..] .run(); } -#[cargo_test] +#[allow(dead_code)] fn publish_with_select_features() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); @@ -1089,7 +1089,7 @@ You may press ctrl-c [..] .run(); } -#[cargo_test] +#[allow(dead_code)] fn publish_with_all_features() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); @@ -1140,7 +1140,7 @@ You may press ctrl-c [..] .run(); } -#[cargo_test] +#[allow(dead_code)] fn publish_with_no_default_features() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -1176,7 +1176,7 @@ fn publish_with_no_default_features() { .run(); } -#[cargo_test] +#[allow(dead_code)] fn publish_with_patch() { let registry = RegistryBuilder::new().http_api().http_index().build(); Package::new("bar", "1.0.0").publish(); @@ -1282,7 +1282,7 @@ You may press ctrl-c [..] ); } -#[cargo_test] +#[allow(dead_code)] fn publish_checks_for_token_before_verify() { let registry = registry::RegistryBuilder::new() .no_configure_token() @@ -1331,7 +1331,7 @@ fn publish_checks_for_token_before_verif .run(); } -#[cargo_test] +#[allow(dead_code)] fn publish_with_bad_source() { let p = project() .file( @@ -1380,7 +1380,7 @@ include `--registry crates-io` to use cr } // A dependency with both `git` and `version`. -#[cargo_test] +#[allow(dead_code)] fn publish_git_with_version() { let registry = RegistryBuilder::new().http_api().http_index().build(); @@ -1524,7 +1524,7 @@ You may press ctrl-c [..] ); } -#[cargo_test] +#[allow(dead_code)] fn publish_dev_dep_no_version() { let registry = RegistryBuilder::new().http_api().http_index().build(); @@ -1614,7 +1614,7 @@ repository = "foo" ); } -#[cargo_test] +#[allow(dead_code)] fn credentials_ambiguous_filename() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); @@ -1670,7 +1670,7 @@ You may press ctrl-c [..] // --index will not load registry.token to avoid possibly leaking // crates.io token to another server. -#[cargo_test] +#[allow(dead_code)] fn index_requires_token() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -1705,7 +1705,7 @@ fn index_requires_token() { } // publish with source replacement without --registry -#[cargo_test] +#[allow(dead_code)] fn cratesio_source_replacement() { registry::init(); let p = project() @@ -1734,7 +1734,7 @@ include `--registry dummy-registry` or ` .run(); } -#[cargo_test] +#[allow(dead_code)] fn publish_with_missing_readme() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -1782,7 +1782,7 @@ Caused by: } // Registry returns an API error. -#[cargo_test] +#[allow(dead_code)] fn api_error_json() { let _registry = registry::RegistryBuilder::new() .alternative() @@ -1830,7 +1830,7 @@ Caused by: } // Registry returns an API error with a 200 status code. -#[cargo_test] +#[allow(dead_code)] fn api_error_200() { let _registry = registry::RegistryBuilder::new() .alternative() @@ -1878,7 +1878,7 @@ Caused by: } // Registry returns an error code without a JSON message. -#[cargo_test] +#[allow(dead_code)] fn api_error_code() { let _registry = registry::RegistryBuilder::new() .alternative() @@ -1932,7 +1932,7 @@ Caused by: } // Registry has a network error. -#[cargo_test] +#[allow(dead_code)] fn api_curl_error() { let _registry = registry::RegistryBuilder::new() .alternative() @@ -1982,7 +1982,7 @@ Caused by: } // Registry returns an invalid response. -#[cargo_test] +#[allow(dead_code)] fn api_other_error() { let _registry = registry::RegistryBuilder::new() .alternative() @@ -2032,7 +2032,7 @@ Caused by: .run(); } -#[cargo_test] +#[allow(dead_code)] fn in_package_workspace() { let registry = RegistryBuilder::new().http_api().http_index().build(); @@ -2084,7 +2084,7 @@ You may press ctrl-c [..] validate_upload_li(); } -#[cargo_test] +#[allow(dead_code)] fn with_duplicate_spec_in_members() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -2136,7 +2136,7 @@ fn with_duplicate_spec_in_members() { .run(); } -#[cargo_test] +#[allow(dead_code)] fn in_package_workspace_with_members_with_features_old() { let registry = RegistryBuilder::new().http_api().http_index().build(); @@ -2187,7 +2187,7 @@ You may press ctrl-c [..] validate_upload_li(); } -#[cargo_test] +#[allow(dead_code)] fn in_virtual_workspace() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -2223,7 +2223,7 @@ fn in_virtual_workspace() { .run(); } -#[cargo_test] +#[allow(dead_code)] fn in_virtual_workspace_with_p() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); @@ -2281,7 +2281,7 @@ You may press ctrl-c [..] .run(); } -#[cargo_test] +#[allow(dead_code)] fn in_package_workspace_not_found() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -2326,7 +2326,7 @@ error: package ID specification `li` did .run(); } -#[cargo_test] +#[allow(dead_code)] fn in_package_workspace_found_multiple() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); @@ -2383,7 +2383,7 @@ error: the `-p` argument must be specifi .run(); } -#[cargo_test] +#[allow(dead_code)] // https://github.com/rust-lang/cargo/issues/10536 fn publish_path_dependency_without_workspace() { // Use local registry for faster test times since no publish will occur @@ -2430,7 +2430,7 @@ error: package ID specification `bar` di .run(); } -#[cargo_test] +#[allow(dead_code)] fn http_api_not_noop() { let registry = registry::RegistryBuilder::new().http_api().build(); @@ -2491,7 +2491,7 @@ You may press ctrl-c [..] p.cargo("build").run(); } -#[cargo_test] +#[allow(dead_code)] fn wait_for_first_publish() { // Counter for number of tries before the package is "published" let arc: Arc> = Arc::new(Mutex::new(0)); @@ -2573,7 +2573,7 @@ You may press ctrl-c to skip waiting; th /// A separate test is needed for package names with - or _ as they hit /// the responder twice per cargo invocation. If that ever gets changed /// this test will need to be changed accordingly. -#[cargo_test] +#[allow(dead_code)] fn wait_for_first_publish_underscore() { // Counter for number of tries before the package is "published" let arc: Arc> = Arc::new(Mutex::new(0)); @@ -2669,7 +2669,7 @@ You may press ctrl-c to skip waiting; th p.cargo("build").with_status(0).run(); } -#[cargo_test] +#[allow(dead_code)] fn wait_for_subsequent_publish() { // Counter for number of tries before the package is "published" let arc: Arc> = Arc::new(Mutex::new(0)); @@ -2761,7 +2761,7 @@ You may press ctrl-c to skip waiting; th p.cargo("check").with_status(0).run(); } -#[cargo_test] +#[allow(dead_code)] fn skip_wait_for_publish() { // Intentionally using local registry so the crate never makes it to the index let registry = registry::init(); Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs =================================================================== --- rust.orig/src/tools/cargo/tests/testsuite/credential_process.rs +++ rust/src/tools/cargo/tests/testsuite/credential_process.rs @@ -8,7 +8,7 @@ fn toml_bin(proj: &Project, name: &str) proj.bin(name).display().to_string().replace('\\', "\\\\") } -#[cargo_test] +#[allow(dead_code)] fn gated() { let _alternative = registry::RegistryBuilder::new() .alternative() @@ -65,7 +65,7 @@ or use environment variable CARGO_REGIST .run(); } -#[cargo_test] +#[allow(dead_code)] fn warn_both_token_and_process() { // Specifying both credential-process and a token in config should issue a warning. let _server = registry::RegistryBuilder::new() @@ -212,7 +212,7 @@ fn get_token_test() -> (Project, TestReg (p, server) } -#[cargo_test] +#[allow(dead_code)] fn publish() { // Checks that credential-process is used for `cargo publish`. let (p, _t) = get_token_test(); @@ -237,7 +237,7 @@ You may press ctrl-c [..] assert_eq!(calls, 1); } -#[cargo_test] +#[allow(dead_code)] fn basic_unsupported() { // Non-action commands don't support login/logout. let registry = registry::RegistryBuilder::new() @@ -280,7 +280,7 @@ the credential-process configuration val .run(); } -#[cargo_test] +#[allow(dead_code)] fn login() { let server = registry::RegistryBuilder::new() .no_configure_token() @@ -337,7 +337,7 @@ fn login() { ); } -#[cargo_test] +#[allow(dead_code)] fn logout() { let server = registry::RegistryBuilder::new() .no_configure_token() @@ -395,7 +395,7 @@ token for `crates-io` has been erased! ); } -#[cargo_test] +#[allow(dead_code)] fn yank() { let (p, _t) = get_token_test(); @@ -410,7 +410,7 @@ fn yank() { .run(); } -#[cargo_test] +#[allow(dead_code)] fn owner() { let (p, _t) = get_token_test(); @@ -425,7 +425,7 @@ fn owner() { .run(); } -#[cargo_test] +#[allow(dead_code)] fn libexec_path() { // cargo: prefixed names use the sysroot let server = registry::RegistryBuilder::new() @@ -459,7 +459,7 @@ Caused by: .run(); } -#[cargo_test] +#[allow(dead_code)] fn invalid_token_output() { // Error when credential process does not output the expected format for a token. let _server = registry::RegistryBuilder::new()