summaryrefslogtreecommitdiff
path: root/test_util/src/builders.rs
diff options
context:
space:
mode:
Diffstat (limited to 'test_util/src/builders.rs')
-rw-r--r--test_util/src/builders.rs17
1 files changed, 3 insertions, 14 deletions
diff --git a/test_util/src/builders.rs b/test_util/src/builders.rs
index 324d30e94..48c001a7e 100644
--- a/test_util/src/builders.rs
+++ b/test_util/src/builders.rs
@@ -12,8 +12,8 @@ use std::process::Stdio;
use std::rc::Rc;
use os_pipe::pipe;
-use pretty_assertions::assert_eq;
+use crate::assertions::assert_wildcard_match;
use crate::deno_exe_path;
use crate::env_vars_for_npm_tests_no_sync_download;
use crate::fs::PathRef;
@@ -23,7 +23,6 @@ use crate::new_deno_dir;
use crate::pty::Pty;
use crate::strip_ansi_codes;
use crate::testdata_path;
-use crate::wildcard_match;
use crate::HttpServerGuard;
use crate::TempDir;
@@ -660,14 +659,7 @@ impl TestCommandOutput {
actual: &str,
expected: impl AsRef<str>,
) -> &Self {
- let expected = expected.as_ref();
- if !expected.contains("[WILDCARD]") {
- assert_eq!(actual, expected);
- } else if !wildcard_match(expected, actual) {
- println!("OUTPUT START\n{actual}\nOUTPUT END");
- println!("EXPECTED START\n{expected}\nEXPECTED END");
- panic!("pattern match failed");
- }
+ assert_wildcard_match(actual, expected.as_ref());
self
}
@@ -679,10 +671,7 @@ impl TestCommandOutput {
) -> &Self {
let output_path = self.testdata_dir().join(file_path);
println!("output path {}", output_path);
- let expected_text =
- std::fs::read_to_string(&output_path).unwrap_or_else(|err| {
- panic!("failed loading {}\n\n{err:#}", output_path)
- });
+ let expected_text = output_path.read_to_string();
self.inner_assert_matches_text(actual, expected_text)
}
}