traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1412 from ahelwer/windows-test-failures

Browse source 
Fixed some test failures due to CRLF line endings
This commit is contained in:
Max Brunsfeld 2021-10-05 14:13:26 -07:00 • committed by GitHub
commit 21fd9ee36c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 59 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cli/src/tests/corpus_test.rs
View file

@ -229,12 +229,15 @@ fn test_feature_corpus_files() {
eprintln!("test language: {:?}", language_name);
let expected_message = fs::read_to_string(&error_message_path).unwrap();
let expected_message = fs::read_to_string(&error_message_path)
.unwrap()
.replace("\r\n", "\n");
if let Err(e) = generate_result {
if e.to_string() != expected_message {
let actual_message = e.to_string().replace("\r\n", "\n");
if expected_message != actual_message {
eprintln!(
"Unexpected error message.\n\nExpected:\n\n{}\nActual:\n\n{}\n",
expected_message, e
expected_message, actual_message
);
failure_count += 1;
}

4
cli/src/util.rs
View file

@ -1,10 +1,12 @@
use anyhow::{anyhow, Context, Result};
use anyhow::Result;
use std::io;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc;
use std::thread;
use tree_sitter::Parser;
#[cfg(unix)]
use anyhow::{anyhow, Context};
#[cfg(unix)]
use std::path::PathBuf;
#[cfg(unix)]