mirror/youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-12-04 19:18:29 +01:00
Code Issues

Adapt memory tests

Browse Source
This commit is contained in:
Furisto 2021-09-07 22:22:27 +02:00
parent cbc8d1af3d
commit cf47693598
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cgroups/src/v2/memory.rs
View File

@ -300,6 +300,11 @@ mod tests {
if linux_memory.limit.is_none() {
return result.is_err();
}
if let Some(limit) = linux_memory.limit {
if limit != -1 && swap != -1 && swap < limit {
return result.is_err();
}
}
}
if let Some(reservation) = linux_memory.reservation {
@ -320,7 +325,17 @@ mod tests {
let swap_content = read_to_string(tmp.join(CGROUP_MEMORY_SWAP)).expect("read swap limit to string");
let swap_check = match linux_memory.swap {
Some(swap) if swap == -1 => swap_content == "max",
Some(swap) => swap_content == (swap - linux_memory.limit.unwrap()).to_string(),
Some(swap) => {
if let Some(limit) = linux_memory.limit {
if limit == -1 {
swap_content == swap.to_string()
} else {
swap_content == (swap - linux_memory.limit.unwrap()).to_string()
}
} else {
false
}
}
None => {
match linux_memory.limit {
Some(limit) if limit == -1 => swap_content == "max",