foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

chore: fix flaky publish::npm_workspace test (#24511)

Browse source
This commit is contained in:
David Sherret 2024-07-10 16:44:37 -04:00 committed by GitHub
parent a49d0bd10b
commit ad8d265e29
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/specs/publish/npm_workspace/publish.out
View file

@ -4,6 +4,7 @@ Check file:///[WILDLINE]/npm_workspace/subtract/index.ts
Checking for slow types in the public API... Checking for slow types in the public API...
Check file:///[WILDLINE]/npm_workspace/add/index.ts Check file:///[WILDLINE]/npm_workspace/add/index.ts
Check file:///[WILDLINE]/npm_workspace/subtract/index.ts Check file:///[WILDLINE]/npm_workspace/subtract/index.ts
[UNORDERED_START]
Simulating publish of @scope/add@1.0.0 with files: Simulating publish of @scope/add@1.0.0 with files:
file:///[WILDLINE]/npm_workspace/add/index.ts ([WILDLINE]) file:///[WILDLINE]/npm_workspace/add/index.ts ([WILDLINE])
file:///[WILDLINE]/npm_workspace/add/jsr.json ([WILDLINE]) file:///[WILDLINE]/npm_workspace/add/jsr.json ([WILDLINE])
@ -12,4 +13,5 @@ Simulating publish of @scope/subtract@1.0.0 with files:
file:///[WILDLINE]/npm_workspace/subtract/index.ts ([WILDLINE]) file:///[WILDLINE]/npm_workspace/subtract/index.ts ([WILDLINE])
file:///[WILDLINE]/npm_workspace/subtract/jsr.json ([WILDLINE]) file:///[WILDLINE]/npm_workspace/subtract/jsr.json ([WILDLINE])
file:///[WILDLINE]/npm_workspace/subtract/package.json ([WILDLINE]) file:///[WILDLINE]/npm_workspace/subtract/package.json ([WILDLINE])
[UNORDERED_END]
Warning Aborting due to --dry-run Warning Aborting due to --dry-run

48
tests/util/server/src/lib.rs
View file

@ -846,25 +846,45 @@ pub fn wildcard_match_detailed(
); );
return WildcardMatchResult::Fail(output_lines.join("\n")); return WildcardMatchResult::Fail(output_lines.join("\n"));
} }
for (actual, expected) in actual_lines.iter().zip(expected_lines.iter())
if let Some(invalid_expected) =
expected_lines.iter().find(|e| e.contains("[WILDCARD]"))
{ {
if actual != expected { panic!(
output_lines concat!(
.push("==== UNORDERED LINE DID NOT MATCH ====".to_string()); "Cannot use [WILDCARD] inside [UNORDERED_START]. Use [WILDLINE] instead.\n",
output_lines.push(format!( " Invalid expected line: {}"
" ACTUAL: {}", ),
colors::red(annotate_whitespace(actual)) invalid_expected
)); );
output_lines.push(format!( }
"EXPECTED: {}",
colors::green(annotate_whitespace(expected)) for actual_line in actual_lines {
)); let maybe_found_index =
return WildcardMatchResult::Fail(output_lines.join("\n")); expected_lines.iter().position(|expected_line| {
} else { actual_line == *expected_line
|| wildcard_match(expected_line, actual_line)
});
if let Some(found_index) = maybe_found_index {
let expected = expected_lines.remove(found_index);
output_lines.push(format!( output_lines.push(format!(
"<FOUND>{}</FOUND>", "<FOUND>{}</FOUND>",
colors::gray(annotate_whitespace(expected)) colors::gray(annotate_whitespace(expected))
)); ));
} else {
output_lines
.push("==== UNORDERED LINE DID NOT MATCH ====".to_string());
output_lines.push(format!(
" ACTUAL: {}",
colors::red(annotate_whitespace(actual_line))
));
for expected in expected_lines {
output_lines.push(format!(
" EXPECTED ANY: {}",
colors::green(annotate_whitespace(expected))
));
}
return WildcardMatchResult::Fail(output_lines.join("\n"));
} }
} }
} }