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

Use prop_filter to force directory treenode #1227

Merged
merged 1 commit into from
Jan 14, 2025
+7 −6
Merged

Use prop_filter to force directory treenode #1227

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
13 changes: 7 additions & 6 deletions mountpoint-s3/tests/reftests/generators.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ impl Debug for TreeNode {
/// Parents are always [TreeNode::Directory].
pub fn gen_tree(depth: u32, max_size: u32, max_items: u32, max_width: usize) -> impl Strategy<Value = TreeNode> {
let leaf = any::<FileContent>().prop_map(TreeNode::File);

let strategy = leaf.prop_recursive(
leaf.prop_recursive(
depth, // levels
max_size, // max number of nodes
max_items, // number of items per collection
Expand All @@ -138,10 +137,12 @@ pub fn gen_tree(depth: u32, max_size: u32, max_items: u32, max_width: usize) ->
// Since the size of the tree could be zero, this also introduces directories as leaves.
prop::collection::btree_map(any::<Name>(), inner, 0..max_width).prop_map(TreeNode::Directory)
},
);

// Ensure the root is always a directory by wrapping the inner strategy
prop::collection::btree_map(any::<Name>(), strategy, 0..max_width).prop_map(TreeNode::Directory)
)
// Ensure the root is always a directory by transforming invalid nodes (i.e. file as root) into empty directories
.prop_map(|x| match x {
TreeNode::File(_) => TreeNode::Directory(BTreeMap::from([])),
_ => x,
})
}

/// Take a generated tree and create the corresponding S3 namespace (list of keys)
Expand Down
Loading