From d8eed0785c7dbeba8aa4465c67ccf0c00c90ea97 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Fri, 28 Jun 2024 22:32:11 -0400 Subject: [PATCH 1/2] test: relax git cli assertion See commit 51ebba2fc1c581e4ec30b308c07f7b70ef3d2f10 --- tests/testsuite/git.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs index 6c42be10bc2..9826ab051b8 100644 --- a/tests/testsuite/git.rs +++ b/tests/testsuite/git.rs @@ -2855,7 +2855,7 @@ fn use_the_cli() { [UPDATING] git repository `[ROOTURL]/dep1` [RUNNING] `git fetch --verbose --force --update-head-ok [..][ROOTURL]/dep1[..] [..]+HEAD:refs/remotes/origin/HEAD[..]` From [ROOTURL]/dep1 - * [new ref] HEAD -> origin/HEAD + * [new ref] [..] -> origin/HEAD[..] [LOCKING] 2 packages to latest compatible versions [CHECKING] dep1 v0.5.0 ([ROOTURL]/dep1#[..]) [RUNNING] `rustc --crate-name dep1 [..]` From fb56fffbb107a10ff43773195827fa4b405370fa Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Fri, 28 Jun 2024 22:42:22 -0400 Subject: [PATCH 2/2] test: omit target-dir name (again) See commit 47ddb3a57d26257f5ac9fb7ee4643ccef83e5e25 --- tests/testsuite/publish_lockfile.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testsuite/publish_lockfile.rs b/tests/testsuite/publish_lockfile.rs index 8bbfc798f7c..eaeb057964d 100644 --- a/tests/testsuite/publish_lockfile.rs +++ b/tests/testsuite/publish_lockfile.rs @@ -241,7 +241,7 @@ fn note_resolve_changes() { [ARCHIVING] Cargo.toml.orig [ARCHIVING] src/main.rs [PACKAGED] 4 files, [FILE_SIZE]B ([FILE_SIZE]B compressed) -[WARNING] no (git) Cargo.toml found at `target/tmp/[..]/foo/Cargo.toml` in workdir `[..]` +[WARNING] no (git) Cargo.toml found at `[..]/foo/Cargo.toml` in workdir `[..]` "#]].unordered()) .run();