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

Revert "Fix never looping loops" #373

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Revert "Fix never looping loops" #373

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 10 additions & 31 deletions cas/store/tests/filesystem_store_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ use traits::UploadSizeInfo;

use buf_channel::{make_buf_channel_pair, DropCloserReadHalf};
use common::{fs, DigestInfo};
use error::{make_input_err, Code, Error, ResultExt};
use error::{Code, Error, ResultExt};
use filesystem_store::{digest_from_filename, EncodedFilePath, FileEntry, FileEntryImpl, FilesystemStore};
use traits::StoreTrait;

Expand Down Expand Up @@ -308,16 +308,9 @@ mod filesystem_store_tests {
.into_inner();
let mut read_dir_stream = ReadDirStream::new(temp_dir_handle);

while let Some(entry) = read_dir_stream.next().await {
match entry {
Ok(temp_dir_entry) => {
let path = temp_dir_entry.path();
panic!("No files should exist in temp directory, found: {path:?}");
}
Err(e) => {
return Err(make_input_err!("Couldn't read directory entry: {e:?}"));
}
}
while let Some(temp_dir_entry) = read_dir_stream.next().await {
let path = temp_dir_entry?.path();
panic!("No files should exist in temp directory, found: {path:?}");
}

Ok(())
Expand Down Expand Up @@ -417,16 +410,9 @@ mod filesystem_store_tests {
.err_tip(|| "Failed opening temp directory")?
.into_inner();
let mut read_dir_stream = ReadDirStream::new(temp_dir_handle);
while let Some(entry) = read_dir_stream.next().await {
match entry {
Ok(temp_dir_entry) => {
let path = temp_dir_entry.path();
panic!("No files should exist in temp directory, found: {path:?}");
}
Err(e) => {
return Err(make_input_err!("Couldn't read directory entry: {e:?}"));
}
}
while let Some(temp_dir_entry) = read_dir_stream.next().await {
let path = temp_dir_entry?.path();
panic!("No files should exist in temp directory, found: {path:?}");
}
}

Expand Down Expand Up @@ -521,16 +507,9 @@ mod filesystem_store_tests {
.err_tip(|| "Failed opening temp directory")?
.into_inner();
let mut read_dir_stream = ReadDirStream::new(temp_dir_handle);
while let Some(entry) = read_dir_stream.next().await {
match entry {
Ok(temp_dir_entry) => {
let path = temp_dir_entry.path();
panic!("No files should exist in temp directory, found: {path:?}");
}
Err(e) => {
return Err(make_input_err!("Couldn't read directory entry: {e:?}"));
}
}
while let Some(temp_dir_entry) = read_dir_stream.next().await {
let path = temp_dir_entry?.path();
panic!("No files should exist in temp directory, found: {:?}", path);
}
}

Expand Down