From 20e58f6ce5bc3d34dd8df6061ea7534809fa6ac6 Mon Sep 17 00:00:00 2001 From: Anton Lazarev Date: Thu, 20 Oct 2022 20:05:34 -0700 Subject: [PATCH] update package, publish, and publish_lockfile tests --- tests/testsuite/cross_publish.rs | 2 ++ tests/testsuite/package.rs | 18 +++++++++++++++++ tests/testsuite/publish.rs | 31 +++++++++++++++++++++++++++++ tests/testsuite/publish_lockfile.rs | 14 ++++++++++++- 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/tests/testsuite/cross_publish.rs b/tests/testsuite/cross_publish.rs index aa02a8389f8f..2e4c44c420f6 100644 --- a/tests/testsuite/cross_publish.rs +++ b/tests/testsuite/cross_publish.rs @@ -46,6 +46,7 @@ fn simple_cross_package() { [VERIFYING] foo v0.0.0 ([CWD]) [COMPILING] foo v0.0.0 ([CWD]/target/package/foo-0.0.0) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] 4 files, [..] ([..] compressed) ", ) .run(); @@ -108,6 +109,7 @@ fn publish_with_target() { [VERIFYING] foo v0.0.0 ([CWD]) [COMPILING] foo v0.0.0 ([CWD]/target/package/foo-0.0.0) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] [..] [UPLOADING] foo v0.0.0 ([CWD]) ", ) diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs index 5ebde46358e2..3e7b5b7153ff 100644 --- a/tests/testsuite/package.rs +++ b/tests/testsuite/package.rs @@ -39,6 +39,7 @@ See [..] [VERIFYING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 ([CWD][..]) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] 4 files, [..] ([..] compressed) ", ) .run(); @@ -77,6 +78,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for [VERIFYING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 ([CWD][..]) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] [..] files, [..] ([..] compressed) ", ) .run(); @@ -103,6 +105,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for [VERIFYING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 ([CWD][..]) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] [..] files, [..] ([..] compressed) ", ) .run(); @@ -129,6 +132,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for [VERIFYING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 ([CWD][..]) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] [..] files, [..] ([..] compressed) ", ) .run(); @@ -158,6 +162,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for [ARCHIVING] Cargo.toml [ARCHIVING] Cargo.toml.orig [ARCHIVING] src/main.rs +[PACKAGED] 5 files, [..] ([..] compressed) ", ) .run(); @@ -198,6 +203,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for [ARCHIVING] Cargo.toml [ARCHIVING] Cargo.toml.orig [ARCHIVING] src/lib.rs +[PACKAGED] 4 files, [..] ([..] compressed) ", ) .run(); @@ -239,6 +245,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for [VERIFYING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 ([CWD][..]) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] [..] files, [..] ([..] compressed) ", ) .run(); @@ -488,6 +495,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for [ARCHIVING] some_dir/file_deep_4 [ARCHIVING] some_dir/file_deep_5 [ARCHIVING] src/main.rs +[PACKAGED] 15 files, [..] ([..] compressed) ", ) .run(); @@ -555,6 +563,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for [ARCHIVING] Cargo.toml.orig [ARCHIVING] foo.txt [ARCHIVING] src/main.rs +[PACKAGED] 7 files, [..] ([..] compressed) ", ) .run(); @@ -708,6 +717,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for [VERIFYING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 ([CWD][..]) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] 4 files, [..] ([..] compressed) ", ) .run(); @@ -775,6 +785,7 @@ See [..] [VERIFYING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 ([CWD][..]) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] 5 files, [..] ([..] compressed) ", ) .run(); @@ -1788,6 +1799,7 @@ fn invalid_license_file_path() { Please update the license-file setting in the manifest at `[..]/foo/Cargo.toml` This may become a hard error in the future. [PACKAGING] foo v1.0.0 ([..]/foo) +[PACKAGED] [..] files, [..] ([..] compressed) ", ) .run(); @@ -1835,6 +1847,7 @@ subdir/LICENSE [ARCHIVING] Cargo.toml.orig [ARCHIVING] src/lib.rs [ARCHIVING] subdir/LICENSE +[PACKAGED] 5 files, [..] ([..] compressed) ", ) .run(); @@ -1891,6 +1904,7 @@ src/lib.rs [VERIFYING] foo v1.0.0 [..] [COMPILING] foo v1.0.0 [..] [FINISHED] [..] +[PACKAGED] 4 files, [..] ([..] compressed) ", ) .run(); @@ -1949,6 +1963,7 @@ src/lib.rs [VERIFYING] foo v1.0.0 [..] [COMPILING] foo v1.0.0 [..] [FINISHED] [..] +[PACKAGED] 4 files, [..] ([..] compressed) ", ) .run(); @@ -1994,6 +2009,7 @@ fn package_restricted_windows() { [PACKAGING] foo [..] [VERIFYING] foo [..] [COMPILING] foo [..] +[PACKAGED] [..] files, [..] ([..] compressed) [FINISHED] [..] ", ) @@ -2367,12 +2383,14 @@ See [..] [VERIFYING] bar v0.0.1 ([CWD]/bar) [COMPILING] bar v0.0.1 ([CWD][..]) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] [..] files, [..] ([..] compressed) [WARNING] manifest has no documentation, [..] See [..] [PACKAGING] foo v0.0.1 ([CWD]) [VERIFYING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 ([CWD][..]) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] [..] files, [..] ([..] compressed) ", ) .run(); diff --git a/tests/testsuite/publish.rs b/tests/testsuite/publish.rs index d0851f62407b..a0661f6943c0 100644 --- a/tests/testsuite/publish.rs +++ b/tests/testsuite/publish.rs @@ -126,6 +126,7 @@ fn simple() { [WARNING] manifest has no documentation, [..] See [..] [PACKAGING] foo v0.0.1 ([CWD]) +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] foo v0.0.1 ([CWD]) ", ) @@ -178,6 +179,7 @@ fn old_token_location() { [WARNING] manifest has no documentation, [..] See [..] [PACKAGING] foo v0.0.1 ([CWD]) +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] foo v0.0.1 ([CWD]) ", ) @@ -216,6 +218,7 @@ fn simple_with_index() { [..] [..] [..] +[..] [UPLOADING] foo v0.0.1 ([CWD])", ) .run(); @@ -405,6 +408,7 @@ fn publish_clean() { [VERIFYING] foo v0.0.1 ([CWD]) [..] [..] +[..] [UPLOADING] foo v0.0.1 ([CWD])", ) .run(); @@ -446,6 +450,7 @@ fn publish_in_sub_repo() { [VERIFYING] foo v0.0.1 ([CWD]) [..] [..] +[..] [UPLOADING] foo v0.0.1 ([CWD])", ) .run(); @@ -487,6 +492,7 @@ fn publish_when_ignored() { [VERIFYING] foo v0.0.1 ([CWD]) [..] [..] +[..] [UPLOADING] foo v0.0.1 ([CWD])", ) .run(); @@ -538,6 +544,7 @@ fn ignore_when_crate_ignored() { [VERIFYING] foo v0.0.1 ([CWD]) [..] [..] +[..] [UPLOADING] foo v0.0.1 ([CWD])", ) .run(); @@ -617,6 +624,7 @@ See [..] [VERIFYING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 [..] [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] foo v0.0.1 ([CWD]) [WARNING] aborting upload due to dry run ", @@ -723,6 +731,7 @@ fn publish_allowed_registry() { [VERIFYING] foo v0.0.1 ([CWD]) [..] [..] +[..] [UPLOADING] foo v0.0.1 ([CWD])", ) .run(); @@ -774,6 +783,7 @@ fn publish_implicitly_to_only_allowed_registry() { [VERIFYING] foo v0.0.1 ([CWD]) [..] [..] +[..] [UPLOADING] foo v0.0.1 ([CWD])", ) .run(); @@ -896,6 +906,7 @@ The registry `alternative` is not listed in the `publish` value in Cargo.toml. [VERIFYING] foo v0.0.1 ([CWD]) [..] [..] +[..] [UPLOADING] foo v0.0.1 ([CWD])", ) .run(); @@ -940,6 +951,7 @@ fn publish_with_select_features() { [VERIFYING] foo v0.0.1 ([CWD]) [..] [..] +[..] [UPLOADING] foo v0.0.1 ([CWD]) ", ) @@ -985,6 +997,7 @@ fn publish_with_all_features() { [VERIFYING] foo v0.0.1 ([CWD]) [..] [..] +[..] [UPLOADING] foo v0.0.1 ([CWD]) ", ) @@ -1083,6 +1096,7 @@ fn publish_with_patch() { [..] [..] [..] +[..] [UPLOADING] foo v0.0.1 ([CWD])", ) .run(); @@ -1168,6 +1182,7 @@ fn publish_checks_for_token_before_verify() { [VERIFYING] foo v0.0.1 ([CWD]) [..] [..] +[..] [UPLOADING] foo v0.0.1 [..] [WARNING] aborting upload due to dry run ", @@ -1275,6 +1290,7 @@ fn publish_git_with_version() { [..] [..] [..] +[..] [UPLOADING] foo v0.1.0 ([CWD])", ) .run(); @@ -1391,6 +1407,7 @@ fn publish_dev_dep_no_version() { "\ [UPDATING] [..] [PACKAGING] foo v0.1.0 [..] +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] foo v0.1.0 [..] ", ) @@ -1473,6 +1490,7 @@ fn credentials_ambiguous_filename() { [..] [..] [..] +[..] [UPLOADING] foo v0.0.1 [..] ", ) @@ -1573,6 +1591,7 @@ fn publish_with_missing_readme() { "\ [UPDATING] [..] [PACKAGING] foo v0.1.0 [..] +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] foo v0.1.0 [..] [ERROR] failed to read `readme` file for package `foo v0.1.0 ([ROOT]/foo)` @@ -1624,6 +1643,7 @@ fn api_error_json() { "\ [UPDATING] [..] [PACKAGING] foo v0.0.1 [..] +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] foo v0.0.1 [..] [ERROR] failed to publish to registry at http://127.0.0.1:[..]/ @@ -1671,6 +1691,7 @@ fn api_error_200() { "\ [UPDATING] [..] [PACKAGING] foo v0.0.1 [..] +[PACKAGED] [..] files, [..] (598 B compressed) [UPLOADING] foo v0.0.1 [..] [ERROR] failed to publish to registry at http://127.0.0.1:[..]/ @@ -1718,6 +1739,7 @@ fn api_error_code() { "\ [UPDATING] [..] [PACKAGING] foo v0.0.1 [..] +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] foo v0.0.1 [..] [ERROR] failed to publish to registry at http://127.0.0.1:[..]/ @@ -1773,6 +1795,7 @@ fn api_curl_error() { "\ [UPDATING] [..] [PACKAGING] foo v0.0.1 [..] +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] foo v0.0.1 [..] [ERROR] failed to publish to registry at http://127.0.0.1:[..]/ @@ -1820,6 +1843,7 @@ fn api_other_error() { "\ [UPDATING] [..] [PACKAGING] foo v0.0.1 [..] +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] foo v0.0.1 [..] [ERROR] failed to publish to registry at http://127.0.0.1:[..]/ @@ -1871,6 +1895,7 @@ fn in_package_workspace() { [WARNING] manifest has no documentation, homepage or repository. See [..] [PACKAGING] li v0.0.1 ([CWD]/li) +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] li v0.0.1 ([CWD]/li) ", ) @@ -1967,6 +1992,7 @@ fn in_package_workspace_with_members_with_features_old() { [WARNING] manifest has no documentation, homepage or repository. See [..] [PACKAGING] li v0.0.1 ([CWD]/li) +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] li v0.0.1 ([CWD]/li) ", ) @@ -2055,6 +2081,7 @@ fn in_virtual_workspace_with_p() { [WARNING] manifest has no documentation, homepage or repository. See [..] [PACKAGING] li v0.0.1 ([CWD]/li) +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] li v0.0.1 ([CWD]/li) ", ) @@ -2237,6 +2264,7 @@ fn http_api_not_noop() { [VERIFYING] foo v0.0.1 ([CWD]) [..] [..] +[..] [UPLOADING] foo v0.0.1 ([CWD])", ) .run(); @@ -2323,6 +2351,7 @@ fn wait_for_publish() { [WARNING] manifest has no documentation, [..] See [..] [PACKAGING] delay v0.0.1 ([CWD]) +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] delay v0.0.1 ([CWD]) [UPDATING] `crates-io` index [WAITING] on `delay` to propagate to `crates-io` index (which is replacing registry `crates-io`) (ctrl-c to wait asynchronously) @@ -2420,6 +2449,7 @@ fn wait_for_publish_underscore() { [WARNING] manifest has no documentation, [..] See [..] [PACKAGING] delay_with_underscore v0.0.1 ([CWD]) +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] delay_with_underscore v0.0.1 ([CWD]) [UPDATING] `crates-io` index [WAITING] on `delay_with_underscore` to propagate to `crates-io` index (which is replacing registry `crates-io`) (ctrl-c to wait asynchronously) @@ -2490,6 +2520,7 @@ fn skip_wait_for_publish() { [WARNING] manifest has no documentation, [..] See [..] [PACKAGING] foo v0.0.1 ([CWD]) +[PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] foo v0.0.1 ([CWD]) ", ) diff --git a/tests/testsuite/publish_lockfile.rs b/tests/testsuite/publish_lockfile.rs index 56ece3e645fc..96d24d40f50d 100644 --- a/tests/testsuite/publish_lockfile.rs +++ b/tests/testsuite/publish_lockfile.rs @@ -77,6 +77,7 @@ fn package_lockfile() { [VERIFYING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 ([CWD][..]) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] [..] files, [..] ([..] compressed) ", ) .run(); @@ -135,6 +136,7 @@ src/main.rs [COMPILING] foo v0.0.1 ([..]) [RUNNING] `rustc --crate-name foo src/main.rs [..] [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] 5 files, [..] ([..] compressed) ", ) .run(); @@ -232,6 +234,7 @@ fn note_resolve_changes() { [UPDATING] `[..]` index [NOTE] package `multi v0.1.0` added to the packaged Cargo.lock file, was originally sourced from `[..]/foo/multi` [NOTE] package `patched v1.0.0` added to the packaged Cargo.lock file, was originally sourced from `[..]/foo/patched` +[PACKAGED] [..] files, [..] ([..] compressed) ", ) .run(); @@ -251,7 +254,12 @@ fn outdated_lock_version_change_does_not_warn() { p.change_file("Cargo.toml", &pl_manifest("foo", "0.2.0", "")); p.cargo("package --no-verify") - .with_stderr("[PACKAGING] foo v0.2.0 ([..])") + .with_stderr( + "\ +[PACKAGING] foo v0.2.0 ([..]) +[PACKAGED] [..] files, [..] ([..] compressed) +", + ) .run(); } @@ -301,6 +309,7 @@ fn no_warn_workspace_extras() { "\ [PACKAGING] a v0.1.0 ([..]) [UPDATING] `[..]` index +[PACKAGED] [..] files, [..] ([..] compressed) ", ) .run(); @@ -334,6 +343,7 @@ fn warn_package_with_yanked() { [UPDATING] `[..]` index [WARNING] package `bar v0.1.0` in Cargo.lock is yanked in registry \ `crates-io`, consider updating to a version that is not yanked +[PACKAGED] [..] files, [..] ([..] compressed) ", ) .run(); @@ -450,6 +460,7 @@ src/main.rs [COMPILING] foo v0.0.1 ([..]) [RUNNING] `rustc --crate-name foo src/main.rs [..] [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[PACKAGED] 5 files, [..] ([..] compressed) ", ) .run(); @@ -476,6 +487,7 @@ fn ignore_lockfile_inner() { [ARCHIVING] Cargo.toml [ARCHIVING] Cargo.toml.orig [ARCHIVING] src/main.rs +[PACKAGED] 6 files, [..] ([..] compressed) ", ) .run();