Robot/fd
1
0
Fork 0
mirror of https://github.com/sharkdp/fd.git synced 2024-11-17 09:28:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #937 from tmccombs/less-flaky-tests

Browse source 
Less flaky tests
This commit is contained in:
Tavian Barnes 2022-01-07 10:11:54 -05:00 committed by GitHub
commit 03548a847f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tests/testenv/mod.rs
View file

@ -203,6 +203,19 @@ impl TestEnv {
output output
} }
pub fn assert_success_and_get_normalized_output<P: AsRef<Path>>(
&self,
path: P,
args: &[&str],
) -> String {
let output = self.assert_success_and_get_output(path, args);
normalize_output(
&String::from_utf8_lossy(&output.stdout),
false,
self.normalize_line,
)
}
/// Assert that calling *fd* with the specified arguments produces the expected output. /// Assert that calling *fd* with the specified arguments produces the expected output.
pub fn assert_output(&self, args: &[&str], expected: &str) { pub fn assert_output(&self, args: &[&str], expected: &str) {
self.assert_output_subdirectory(".", args, expected) self.assert_output_subdirectory(".", args, expected)
@ -224,15 +237,9 @@ impl TestEnv {
args: &[&str], args: &[&str],
expected: &str, expected: &str,
) { ) {
let output = self.assert_success_and_get_output(path, args);
// Normalize both expected and actual output. // Normalize both expected and actual output.
let expected = normalize_output(expected, true, self.normalize_line); let expected = normalize_output(expected, true, self.normalize_line);
let actual = normalize_output( let actual = self.assert_success_and_get_normalized_output(path, args);
&String::from_utf8_lossy(&output.stdout),
false,
self.normalize_line,
);
// Compare actual output to expected output. // Compare actual output to expected output.
if expected != actual { if expected != actual {

4
tests/tests.rs
View file

@ -1970,8 +1970,8 @@ fn test_opposing(flag: &str, opposing_flags: &[&str]) {
let mut flags = vec![flag]; let mut flags = vec![flag];
flags.extend_from_slice(opposing_flags); flags.extend_from_slice(opposing_flags);
let out_no_flags = te.assert_success_and_get_output(".", &[]); let out_no_flags = te.assert_success_and_get_normalized_output(".", &[]);
let out_opposing_flags = te.assert_success_and_get_output(".", &flags); let out_opposing_flags = te.assert_success_and_get_normalized_output(".", &flags);
assert_eq!( assert_eq!(
out_no_flags, out_no_flags,