Skip to content

Commit a0b2803

Browse files
borsbors
committed
Auto merge of #14171 - heisen-li:dir_doc, r=weihanglo
test：migrate `doc/directory/docscrape` to snapbox ### What does this PR try to resolve? Complete the following file migration: ``` tests/testsuite/directory.rs tests/testsuite/doc.rs tests/testsuite/docscrape.rs ``` part of #14039
2 parents f5ca9c7 + e29862c commit a0b2803

File tree

4 files changed

+653
-549
lines changed

4 files changed

+653
-549
lines changed

‎crates/cargo-test-support/src/compare.rs

+1
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ static E2E_LITERAL_REDACTIONS: &[(&str, &str)] = &[
279279
("[PUBLISHED]", " Published"),
280280
("[BLOCKING]", " Blocking"),
281281
("[GENERATED]", " Generated"),
282+
("[OPENING]", " Opening"),
282283
];
283284

284285
/// Normalizes the output so that it can be compared against the expected value.

‎tests/testsuite/directory.rs

+75-93
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
//! Tests for directory sources.
22
3-
#![allow(deprecated)]
4-
53
use std::collections::HashMap;
64
use std::fs;
75
use std::str;
@@ -12,6 +10,7 @@ use cargo_test_support::cargo_process;
1210
use cargo_test_support::git;
1311
use cargo_test_support::paths;
1412
use cargo_test_support::registry::{cksum, Package};
13+
use cargo_test_support::str;
1514
use cargo_test_support::{basic_manifest, project, t, ProjectBuilder};
1615

1716
fn setup() {
@@ -107,14 +106,13 @@ fn simple() {
107106
.build();
108107

109108
p.cargo("check")
110-
.with_stderr(
111-
"\
109+
.with_stderr_data(str![[r#"
112110
[LOCKING] 2 packages to latest compatible versions
113111
[CHECKING] bar v0.1.0
114-
[CHECKING] foo v0.1.0 ([CWD])
115-
[FINISHED] [..]
116-
",
117-
)
112+
[CHECKING] foo v0.1.0 ([ROOT]/foo)
113+
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
114+
115+
"#]])
118116
.run();
119117
}
120118

@@ -147,18 +145,17 @@ fn simple_install() {
147145
.build();
148146

149147
cargo_process("install bar")
150-
.with_stderr(
151-
"\
148+
.with_stderr_data(str![[r#"
152149
[INSTALLING] bar v0.1.0
153150
[LOCKING] 2 packages to latest compatible versions
154151
[COMPILING] foo v0.0.1
155152
[COMPILING] bar v0.1.0
156-
[FINISHED] `release` profile [optimized] target(s) in [..]s
153+
[FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s
157154
[INSTALLING] [..]bar[..]
158155
[INSTALLED] package `bar v0.1.0` (executable `bar[EXE]`)
159-
[WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries
160-
",
161-
)
156+
[WARNING] be sure to add `[ROOT]/home/.cargo/bin` to your PATH to be able to run the installed binaries
157+
158+
"#]])
162159
.run();
163160
}
164161

@@ -193,20 +190,19 @@ fn simple_install_fail() {
193190

194191
cargo_process("install bar")
195192
.with_status(101)
196-
.with_stderr(
197-
" Installing bar v0.1.0
198-
error: failed to compile `bar v0.1.0`, intermediate artifacts can be found at `[..]`.
199-
To reuse those artifacts with a future compilation, set the environment variable \
200-
`CARGO_TARGET_DIR` to that path.
193+
.with_stderr_data(str![[r#"
194+
[INSTALLING] bar v0.1.0
195+
[ERROR] failed to compile `bar v0.1.0`, intermediate artifacts can be found at `[..]`.
196+
To reuse those artifacts with a future compilation, set the environment variable `CARGO_TARGET_DIR` to that path.
201197
202198
Caused by:
203199
no matching package found
204200
searched package name: `baz`
205201
perhaps you meant: bar or foo
206202
location searched: registry `crates-io`
207203
required by package `bar v0.1.0`
208-
",
209-
)
204+
205+
"#]])
210206
.run();
211207
}
212208

@@ -243,18 +239,17 @@ fn install_without_feature_dep() {
243239
.build();
244240

245241
cargo_process("install bar")
246-
.with_stderr(
247-
"\
242+
.with_stderr_data(str![[r#"
248243
[INSTALLING] bar v0.1.0
249244
[LOCKING] 2 packages to latest compatible versions
250245
[COMPILING] foo v0.0.1
251246
[COMPILING] bar v0.1.0
252-
[FINISHED] `release` profile [optimized] target(s) in [..]s
247+
[FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s
253248
[INSTALLING] [..]bar[..]
254249
[INSTALLED] package `bar v0.1.0` (executable `bar[EXE]`)
255-
[WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries
256-
",
257-
)
250+
[WARNING] be sure to add `[ROOT]/home/.cargo/bin` to your PATH to be able to run the installed binaries
251+
252+
"#]])
258253
.run();
259254
}
260255

@@ -286,13 +281,12 @@ fn not_there() {
286281

287282
p.cargo("check")
288283
.with_status(101)
289-
.with_stderr(
290-
"\
291-
error: no matching package named `bar` found
292-
location searched: [..]
293-
required by package `foo v0.1.0 ([..])`
294-
",
295-
)
284+
.with_stderr_data(str![[r#"
285+
[ERROR] no matching package named `bar` found
286+
location searched: registry `crates-io`
287+
required by package `foo v0.1.0 ([ROOT]/foo)`
288+
289+
"#]])
296290
.run();
297291
}
298292

@@ -333,15 +327,14 @@ fn multiple() {
333327
.build();
334328

335329
p.cargo("check")
336-
.with_stderr(
337-
"\
330+
.with_stderr_data(str![[r#"
338331
[LOCKING] 2 packages to latest compatible versions
339332
[ADDING] bar v0.1.0 (latest: v0.2.0)
340333
[CHECKING] bar v0.1.0
341-
[CHECKING] foo v0.1.0 ([CWD])
342-
[FINISHED] [..]
343-
",
344-
)
334+
[CHECKING] foo v0.1.0 ([ROOT]/foo)
335+
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
336+
337+
"#]])
345338
.run();
346339
}
347340

@@ -372,17 +365,16 @@ fn crates_io_then_directory() {
372365
.publish();
373366

374367
p.cargo("check")
375-
.with_stderr(
376-
"\
377-
[UPDATING] `[..]` index
368+
.with_stderr_data(str![[r#"
369+
[UPDATING] `dummy-registry` index
378370
[LOCKING] 2 packages to latest compatible versions
379371
[DOWNLOADING] crates ...
380-
[DOWNLOADED] bar v0.1.0 ([..])
372+
[DOWNLOADED] bar v0.1.0 (registry `dummy-registry`)
381373
[CHECKING] bar v0.1.0
382-
[CHECKING] foo v0.1.0 ([CWD])
383-
[FINISHED] [..]
384-
",
385-
)
374+
[CHECKING] foo v0.1.0 ([ROOT]/foo)
375+
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
376+
377+
"#]])
386378
.run();
387379

388380
setup();
@@ -394,13 +386,12 @@ fn crates_io_then_directory() {
394386
v.build();
395387

396388
p.cargo("check")
397-
.with_stderr(
398-
"\
389+
.with_stderr_data(str![[r#"
399390
[CHECKING] bar v0.1.0
400-
[CHECKING] foo v0.1.0 ([CWD])
401-
[FINISHED] [..]
402-
",
403-
)
391+
[CHECKING] foo v0.1.0 ([ROOT]/foo)
392+
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
393+
394+
"#]])
404395
.run();
405396
}
406397

@@ -435,9 +426,8 @@ fn crates_io_then_bad_checksum() {
435426

436427
p.cargo("check")
437428
.with_status(101)
438-
.with_stderr(
439-
"\
440-
error: checksum for `bar v0.1.0` changed between lock files
429+
.with_stderr_data(str![[r#"
430+
[ERROR] checksum for `bar v0.1.0` changed between lock files
441431
442432
this could be indicative of a few possible errors:
443433
@@ -447,8 +437,8 @@ this could be indicative of a few possible errors:
447437
448438
unable to verify that `bar v0.1.0` is the same as when the lockfile was generated
449439
450-
",
451-
)
440+
441+
"#]])
452442
.run();
453443
}
454444

@@ -485,18 +475,15 @@ fn bad_file_checksum() {
485475

486476
p.cargo("check")
487477
.with_status(101)
488-
.with_stderr(
489-
"\
478+
.with_stderr_data(str![[r#"
490479
[LOCKING] 2 packages to latest compatible versions
491-
error: the listed checksum of `[..]lib.rs` has changed:
480+
[ERROR] the listed checksum of `[ROOT]/index/bar/src/lib.rs` has changed:
492481
expected: [..]
493482
actual: [..]
494483
495-
directory sources are not intended to be edited, if modifications are \
496-
required then it is recommended that `[patch]` is used with a forked copy of \
497-
the source
498-
",
499-
)
484+
directory sources are not intended to be edited, if modifications are required then it is recommended that `[patch]` is used with a forked copy of the source
485+
486+
"#]])
500487
.run();
501488
}
502489

@@ -622,13 +609,12 @@ fn git_lock_file_doesnt_change() {
622609
));
623610

624611
p.cargo("check")
625-
.with_stderr(
626-
"\
627-
[CHECKING] [..]
628-
[CHECKING] [..]
629-
[FINISHED] [..]
630-
",
631-
)
612+
.with_stderr_data(str![[r#"
613+
[CHECKING] git v0.5.0 ([..])
614+
[CHECKING] foo v0.0.1 ([ROOT]/foo)
615+
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
616+
617+
"#]])
632618
.run();
633619

634620
let lock2 = p.read_lockfile();
@@ -676,9 +662,8 @@ fn git_override_requires_lockfile() {
676662

677663
p.cargo("check")
678664
.with_status(101)
679-
.with_stderr(
680-
"\
681-
[ERROR] failed to get `git` as a dependency of package `foo v0.0.1 ([..])`
665+
.with_stderr_data(str![[r#"
666+
[ERROR] failed to get `git` as a dependency of package `foo v0.0.1 ([ROOT]/foo)`
682667
683668
Caused by:
684669
failed to load source for dependency `git`
@@ -692,8 +677,8 @@ Caused by:
692677
693678
remove the source replacement configuration, generate a lock file, and then
694679
restore the source replacement configuration to continue the build
695-
",
696-
)
680+
681+
"#]])
697682
.run();
698683
}
699684

@@ -748,13 +733,12 @@ fn workspace_different_locations() {
748733
p.cargo("check").cwd("foo").run();
749734
p.cargo("check")
750735
.cwd("bar")
751-
.with_stderr(
752-
"\
736+
.with_stderr_data(str![[r#"
753737
[LOCKING] 2 packages to latest compatible versions
754-
[CHECKING] bar [..]
755-
[FINISHED] [..]
756-
",
757-
)
738+
[CHECKING] bar v0.1.0 ([ROOT]/foo/bar)
739+
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
740+
741+
"#]])
758742
.run();
759743
}
760744

@@ -784,21 +768,19 @@ fn version_missing() {
784768
.build();
785769

786770
cargo_process("install bar")
787-
.with_stderr(
788-
"\
771+
.with_stderr_data(str![[r#"
789772
[INSTALLING] bar v0.1.0
790-
error: failed to compile [..], intermediate artifacts can be found at `[..]`.
791-
To reuse those artifacts with a future compilation, set the environment variable \
792-
`CARGO_TARGET_DIR` to that path.
773+
[ERROR] failed to compile [..], intermediate artifacts can be found at `[..]`.
774+
To reuse those artifacts with a future compilation, set the environment variable `CARGO_TARGET_DIR` to that path.
793775
794776
Caused by:
795-
failed to select a version for the requirement `foo = \"^2\"`
777+
failed to select a version for the requirement `foo = "^2"`
796778
candidate versions found which didn't match: 0.0.1
797779
location searched: directory source `[..] (which is replacing registry `[..]`)
798780
required by package `bar v0.1.0`
799781
perhaps a crate was updated and forgotten to be re-vendored?
800-
",
801-
)
782+
783+
"#]])
802784
.with_status(101)
803785
.run();
804786
}

0 commit comments

Comments
 (0)