Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Fix AppendVec test breakage... #7693

Merged
ryoqun merged 1 commit into from
Jan 7, 2020
Merged

Fix AppendVec test breakage... #7693

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions runtime/src/append_vec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ pub mod tests {
let file = get_append_vec_path("test_append_vec_set_file_bad_size");
let path = &file.path;
let mut av = AppendVec::new_empty_map(0);
assert_eq!(av.accounts(0).len(), 0);
Copy link
Copy Markdown
Contributor Author

@ryoqun ryoqun Jan 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Carry over only this assertion from now unified test: https://github.com/solana-labs/solana/pull/7693/files#diff-657d1e7648a9fb74cb1582a9c48beb4bR566


let _data = OpenOptions::new()
.read(true)
Expand Down Expand Up @@ -680,18 +681,6 @@ pub mod tests {
);
}

#[test]
fn test_set_file_empty_data() {
Copy link
Copy Markdown
Contributor Author

@ryoqun ryoqun Jan 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test now covered by https://github.com/solana-labs/solana/pull/7693/files#diff-657d1e7648a9fb74cb1582a9c48beb4bR566

let file = get_append_vec_path("test_set_file_empty_data");
let path = &file.path;
let mut av = AppendVec::new(&path, true, 1024 * 1024);

assert_eq!(av.accounts(0).len(), 0);

let result = av.set_file(path);
assert_matches!(result, Ok(_));
}

#[test]
fn test_set_file_crafted_data_len() {
let file = get_append_vec_path("test_set_file_crafted_data_len");
Expand All @@ -713,6 +702,7 @@ pub mod tests {
assert_eq!(account.meta.data_len, crafted_data_len);

av.flush().unwrap();
av.file_size = 0;
let result = av.set_file(path);
assert_matches!(result, Err(ref message) if message.to_string() == *"incorrect layout/length");
}
Expand All @@ -736,6 +726,7 @@ pub mod tests {
assert_matches!(accounts.first(), None);

av.flush().unwrap();
av.file_size = 0;
let result = av.set_file(path);
assert_matches!(result, Err(ref message) if message.to_string() == *"incorrect layout/length");
}
Expand Down Expand Up @@ -788,6 +779,7 @@ pub mod tests {
}

av.flush().unwrap();
av.file_size = 0;
let result = av.set_file(path);
assert_matches!(result, Err(ref message) if message.to_string() == *"incorrect layout/length");
}
Expand Down