yanguangshaonian
/
aya
mirror of https://github.com/aya-rs/aya
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deduplicate test helpers

Browse Source
reviewable/pr941/r1
Tamir Duberstein
parent e5d107dd50
commit 390873e14d
No known key found for this signature in database
6 changed files with 54 additions and 108 deletions

30
aya/src/maps/bloom_filter.rs
Unescape Escape View File

@ -91,36 +91,16 @@ mod tests {
bpf_cmd,
bpf_map_type::{BPF_MAP_TYPE_BLOOM_FILTER, BPF_MAP_TYPE_PERF_EVENT_ARRAY},
},
maps::Map,
maps::{
test_utils::{self, new_map},
Map,
},
obj::{self, maps::LegacyMap, EbpfSectionKind},
sys::{override_syscall, SysResult, Syscall},
};
fn new_obj_map() -> obj::Map {
obj::Map::Legacy(LegacyMap {
def: bpf_map_def {
map_type: BPF_MAP_TYPE_BLOOM_FILTER as u32,
key_size: 4,
value_size: 4,
max_entries: 1024,
..Default::default()
},
section_index: 0,
section_kind: EbpfSectionKind::Maps,
symbol_index: None,
data: Vec::new(),
})
}
fn new_map(obj: obj::Map) -> MapData {
override_syscall(|call| match call {
Syscall::Ebpf {
cmd: bpf_cmd::BPF_MAP_CREATE,
..
} => Ok(1337),
call => panic!("unexpected syscall {:?}", call),
});
MapData::create(obj, "foo", None).unwrap()
test_utils::new_obj_map(BPF_MAP_TYPE_BLOOM_FILTER)
}
fn sys_error(value: i32) -> SysResult<c_long> {

10
aya/src/maps/hash_map/hash_map.rs
Unescape Escape View File

@ -108,16 +108,16 @@ mod tests {
use assert_matches::assert_matches;
use libc::{EFAULT, ENOENT};
use super::{
super::test_utils::{self, new_map},
*,
};
use super::*;
use crate::{
generated::{
bpf_attr, bpf_cmd,
bpf_map_type::{BPF_MAP_TYPE_HASH, BPF_MAP_TYPE_LRU_HASH},
},
maps::Map,
maps::{
test_utils::{self, new_map},
Map,
},
obj,
sys::{override_syscall, SysResult, Syscall},
};

38
aya/src/maps/hash_map/mod.rs
Unescape Escape View File

@ -43,41 +43,3 @@ pub(crate) fn remove<K: Pod>(map: &MapData, key: &K) -> Result<(), MapError> {
.into()
})
}
#[cfg(test)]
mod test_utils {
use crate::{
bpf_map_def,
generated::{bpf_cmd, bpf_map_type},
maps::MapData,
obj::{self, maps::LegacyMap, EbpfSectionKind},
sys::{override_syscall, Syscall},
};
pub(super) fn new_map(obj: obj::Map) -> MapData {
override_syscall(|call| match call {
Syscall::Ebpf {
cmd: bpf_cmd::BPF_MAP_CREATE,
..
} => Ok(1337),
call => panic!("unexpected syscall {:?}", call),
});
MapData::create(obj, "foo", None).unwrap()
}
pub(super) fn new_obj_map(map_type: bpf_map_type) -> obj::Map {
obj::Map::Legacy(LegacyMap {
def: bpf_map_def {
map_type: map_type as u32,
key_size: 4,
value_size: 4,
max_entries: 1024,
..Default::default()
},
section_index: 0,
section_kind: EbpfSectionKind::Maps,
data: Vec::new(),
symbol_index: None,
})
}
}

4
aya/src/maps/hash_map/per_cpu_hash_map.rs
Unescape Escape View File

@ -150,10 +150,10 @@ impl<T: Borrow<MapData>, K: Pod, V: Pod> IterableMap<K, PerCpuValues<V>>
#[cfg(test)]
mod tests {
use super::{super::test_utils, *};
use super::*;
use crate::{
generated::bpf_map_type::{BPF_MAP_TYPE_LRU_PERCPU_HASH, BPF_MAP_TYPE_PERCPU_HASH},
maps::Map,
maps::{test_utils, Map},
};
#[test]

32
aya/src/maps/lpm_trie.rs
Unescape Escape View File

@ -196,7 +196,7 @@ impl<T: Borrow<MapData>, K: Pod, V: Pod> IterableMap<Key<K>, V> for LpmTrie<T, K
#[cfg(test)]
mod tests {
use std::{ffi::c_long, io, mem, net::Ipv4Addr};
use std::{ffi::c_long, io, net::Ipv4Addr};
use assert_matches::assert_matches;
use libc::{EFAULT, ENOENT};
@ -208,36 +208,16 @@ mod tests {
bpf_cmd,
bpf_map_type::{BPF_MAP_TYPE_LPM_TRIE, BPF_MAP_TYPE_PERF_EVENT_ARRAY},
},
maps::Map,
maps::{
test_utils::{self, new_map},
Map,
},
obj::{self, maps::LegacyMap, EbpfSectionKind},
sys::{override_syscall, SysResult, Syscall},
};
fn new_obj_map() -> obj::Map {
obj::Map::Legacy(LegacyMap {
def: bpf_map_def {
map_type: BPF_MAP_TYPE_LPM_TRIE as u32,
key_size: mem::size_of::<Key<u32>>() as u32,
value_size: 4,
max_entries: 1024,
..Default::default()
},
section_index: 0,
section_kind: EbpfSectionKind::Maps,
symbol_index: None,
data: Vec::new(),
})
}
fn new_map(obj: obj::Map) -> MapData {
override_syscall(|call| match call {
Syscall::Ebpf {
cmd: bpf_cmd::BPF_MAP_CREATE,
..
} => Ok(1337),
call => panic!("unexpected syscall {:?}", call),
});
MapData::create(obj, "foo", None).unwrap()
test_utils::new_obj_map(BPF_MAP_TYPE_LPM_TRIE)
}
fn sys_error(value: i32) -> SysResult<c_long> {

48
aya/src/maps/mod.rs
Unescape Escape View File

@ -1021,24 +1021,30 @@ pub fn loaded_maps() -> impl Iterator<Item = Result<MapInfo, MapError>> {
}
#[cfg(test)]
mod tests {
use std::os::fd::AsRawFd as _;
use assert_matches::assert_matches;
use libc::{c_char, EFAULT};
use super::*;
mod test_utils {
use crate::{
bpf_map_def,
generated::{bpf_cmd, bpf_map_type::BPF_MAP_TYPE_HASH},
obj::maps::LegacyMap,
generated::{bpf_cmd, bpf_map_type},
maps::MapData,
obj::{self, maps::LegacyMap, EbpfSectionKind},
sys::{override_syscall, Syscall},
};
fn new_obj_map() -> obj::Map {
pub(super) fn new_map(obj: obj::Map) -> MapData {
override_syscall(|call| match call {
Syscall::Ebpf {
cmd: bpf_cmd::BPF_MAP_CREATE,
..
} => Ok(1337),
call => panic!("unexpected syscall {:?}", call),
});
MapData::create(obj, "foo", None).unwrap()
}
pub(super) fn new_obj_map(map_type: bpf_map_type) -> obj::Map {
obj::Map::Legacy(LegacyMap {
def: bpf_map_def {
map_type: BPF_MAP_TYPE_HASH as u32,
map_type: map_type as u32,
key_size: 4,
value_size: 4,
max_entries: 1024,
@ -1046,10 +1052,28 @@ mod tests {
},
section_index: 0,
section_kind: EbpfSectionKind::Maps,
symbol_index: Some(0),
data: Vec::new(),
symbol_index: None,
})
}
}
#[cfg(test)]
mod tests {
use std::os::fd::AsRawFd as _;
use assert_matches::assert_matches;
use libc::{c_char, EFAULT};
fn new_obj_map() -> obj::Map {
test_utils::new_obj_map(crate::generated::bpf_map_type::BPF_MAP_TYPE_HASH)
}
use super::*;
use crate::{
generated::bpf_cmd,
sys::{override_syscall, Syscall},
};
#[test]
fn test_from_map_id() {

Write Preview
Loading…
Cancel
Save