Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
71 changes: 70 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,4 @@ tower-http = { version = "0.5.2", features = ["cors"] }
reqwest = { version = "0.12.7", features = ["json"] }
dashmap = "6.0.1"
derive_more = {version = "1.0.0" , features=["debug", "from"]}
proptest = "1.0.0"
1 change: 1 addition & 0 deletions crates/melon-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ chrono = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
config = { workspace = true }
proptest = { workspace = true }

[build-dependencies]
tonic-build = { workspace = true }
44 changes: 44 additions & 0 deletions crates/melon-common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -368,3 +368,47 @@ impl From<&proto::JobResult> for JobResult {
}
}
}

#[cfg(test)]
mod tests {
use super::*;
use proptest::prelude::*;

proptest! {
#[test]
fn job_conversion_roundtrip(id in 0u64.., user in ".*", script_path in ".*",
script_args in proptest::collection::vec(".*", 0..10),
cpu_count in 1u32..16, memory in 0u64..(1 << 30), time in 0u32..) {
let req_res = RequestedResources::new(cpu_count, memory, time);
let job = Job::new(id, user, script_path, script_args, req_res);

let proto_job: proto::Job = (&job).into();
let converted_job: Job = (&proto_job).into();

assert_eq!(job.id, converted_job.id);
assert_eq!(job.user, converted_job.user);
assert_eq!(job.script_path, converted_job.script_path);
assert_eq!(job.script_args, converted_job.script_args);
assert_eq!(job.req_res.cpu_count, converted_job.req_res.cpu_count);
assert_eq!(job.req_res.memory, converted_job.req_res.memory);
assert_eq!(job.req_res.time, converted_job.req_res.time);
}

#[test]
fn resource_reduction_and_free(cpu_count in 1u32..16, memory in 0u64..(1 << 30), time in 0u32..) {
let mut node = Node::new("node-1".to_string(), "127.0.0.1".to_string(),
NodeResources::new(cpu_count, memory), NodeStatus::Available);

let req_res = RequestedResources::new(cpu_count / 2, memory / 2, time);
node.reduce_avail_resources(&req_res);

assert!(node.used_resources.cpu_count <= node.avail_resources.cpu_count);
assert!(node.used_resources.memory <= node.avail_resources.memory);

node.free_avail_resource(&req_res);

assert_eq!(node.used_resources.cpu_count, 0);
assert_eq!(node.used_resources.memory, 0);
}
}
}
Loading