Skip to content

Commit

Permalink
Merge branch 'main' into vianney/data-pipeline/add-benchmark-for-conc…
Browse files Browse the repository at this point in the history
…entrator
  • Loading branch information
VianneyRuhlmann committed Aug 29, 2024
2 parents 2548ff5 + d910738 commit a2e8725
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ddcommon/src/entity_id/unix/container_id.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ mod tests {
use super::*;
use maplit::hashmap;

#[cfg_attr(miri, ignore)]
#[test]
fn test_container_id_line_parsing() {
let test_lines = hashmap! {
Expand Down Expand Up @@ -92,6 +93,7 @@ mod tests {
}
}

#[cfg_attr(miri, ignore)]
#[test]
fn test_container_id_file_parsing() {
let test_root_dir = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/tests"));
Expand Down
4 changes: 4 additions & 0 deletions ddcommon/src/entity_id/unix/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,21 +149,25 @@ mod tests {
}
}

#[cfg_attr(miri, ignore)]
#[test]
fn test_entity_id_for_v2() {
test_entity_id("cgroup.v2", Some(&IN_REGEX))
}

#[cfg_attr(miri, ignore)]
#[test]
fn test_entity_id_for_v1() {
test_entity_id("cgroup.linux", Some(&IN_REGEX))
}

#[cfg_attr(miri, ignore)]
#[test]
fn test_entity_id_for_container_id() {
test_entity_id("cgroup.docker", Some(&CI_REGEX))
}

#[cfg_attr(miri, ignore)]
#[test]
fn test_entity_id_for_no_id() {
test_entity_id("cgroup.no_memory", None)
Expand Down

0 comments on commit a2e8725

Please sign in to comment.