Skip to content

Commit 4c6ab71

Browse files
committed
test: Trim leading \r characters before comparing
1 parent 61600f9 commit 4c6ab71

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

tests/cli_errors.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,14 @@ fn fs_errors() {
140140

141141
fs_permission(workspace.as_path(), "+rwx", true); // to allow SampleWorkspace destructor to clean itself
142142

143-
let actual_stderr_lines: BTreeSet<_> = stderr.trim_end().lines().collect();
143+
let actual_stderr_lines: BTreeSet<_> = stderr
144+
.trim_end()
145+
.lines()
146+
.map(|line| line.trim_start_matches('\r'))
147+
.collect();
144148
let expected_stderr_lines = btreeset! {
145-
"\r\r[error] read_dir \"./nested/0\": Permission denied (os error 13)",
146-
"\r\r[error] read_dir \"./empty-dir\": Permission denied (os error 13)",
149+
"[error] read_dir \"./nested/0\": Permission denied (os error 13)",
150+
"[error] read_dir \"./empty-dir\": Permission denied (os error 13)",
147151
};
148152
assert_eq!(actual_stderr_lines, expected_stderr_lines);
149153

0 commit comments

Comments
 (0)