Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ndc-test: replay test folders in alphabetical order #149

Merged
merged 2 commits into from
Jun 7, 2024
Merged

ndc-test: replay test folders in alphabetical order #149

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9972fba
ndc-test: replay test folders in alphabet order
hgiasac Jun 7, 2024
7f28519
Separate warnings from critial errors
paf31 Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions ndc-test/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ pub async fn test_snapshots_in_directory_with<
snapshots_dir: PathBuf,
f: impl Fn(Req) -> F,
) {
match std::fs::read_dir(snapshots_dir) {
Ok(dir) => {
for entry in dir {
let entry = entry.expect("Error reading snapshot directory entry");

if snapshots_dir.exists() {
let entries =
read_dir_sorted_by_name(snapshots_dir).expect("Unable to read snapshot directory");
for entry in entries {
if entry.metadata().is_ok_and(|md| md.is_dir()) {
test!(
entry.file_name().to_str().unwrap_or("{unknown}"),
reporter,
Expand All @@ -168,10 +168,20 @@ pub async fn test_snapshots_in_directory_with<
);
}
}
Err(e) => println!("Warning: a snapshot folder could not be found: {e}"),
} else {
println!("Warning: a snapshot folder could not be found: {snapshots_dir:?}");
}
}

// Read directory and sort inner files by alphabet
fn read_dir_sorted_by_name(snapshots_dir: PathBuf) -> std::io::Result<Vec<std::fs::DirEntry>> {
let mut paths: Vec<_> =
std::fs::read_dir(snapshots_dir)?.collect::<std::io::Result<Vec<_>>>()?;
paths.sort_by_key(std::fs::DirEntry::path);

Ok(paths)
}

#[derive(Debug, Clone)]
pub struct ReportConfiguration {
pub samples: u32,
Expand Down
Loading