fix async_db tests (to fail)
--- failures: async_db::test::test_write_read async_db::test::test_write_read_stream thread 'async_db::test::test_write_read' panicked at 'get: "UnexpectedEnd { additional: 1 }
This commit is contained in:
parent
a1a1d41403
commit
965c021d83
@ -282,7 +282,6 @@ where
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::*;
|
||||
use async_stream::stream;
|
||||
use core::fmt::Debug;
|
||||
use tempfile::tempdir;
|
||||
|
||||
@ -290,24 +289,21 @@ mod test {
|
||||
struct TestData {
|
||||
num: u64,
|
||||
test: String,
|
||||
vnum: Vec<u64>,
|
||||
vstr: Vec<String>,
|
||||
}
|
||||
|
||||
fn gen_data(count: usize) -> impl Iterator<Item = TestData> {
|
||||
(0..count).into_iter().map(|i| TestData {
|
||||
num: i as u64,
|
||||
test: "test".repeat(i),
|
||||
vnum: (0..i * 120).map(|x| (x ^ 0x345FE34) as u64).collect(),
|
||||
vstr: (0..i * 111).map(|x| "test".repeat(x).to_string()).collect(),
|
||||
})
|
||||
}
|
||||
|
||||
fn stream_iter<I, T>(it: I) -> impl Stream<Item = T>
|
||||
where
|
||||
I: Iterator<Item = T>,
|
||||
{
|
||||
stream! {
|
||||
for i in it {
|
||||
yield i;
|
||||
}
|
||||
}
|
||||
async fn assert_data_eq((x, y): (&TestData, TestData)) {
|
||||
assert_eq!(*x, y);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
@ -324,7 +320,7 @@ mod test {
|
||||
let items_iter = gen_data(5);
|
||||
let items: Vec<TestData> = items_iter.collect();
|
||||
|
||||
let src = stream_iter(items.clone().into_iter());
|
||||
let src = futures::stream::iter(items.clone());
|
||||
pin_mut!(src);
|
||||
writer.load(src).await.expect("load");
|
||||
writer.finish().await.expect("finish write");
|
||||
@ -344,7 +340,7 @@ mod test {
|
||||
let items_iter = gen_data(5);
|
||||
let items: Vec<TestData> = items_iter.collect();
|
||||
|
||||
let src = stream_iter(items.clone().into_iter());
|
||||
let src = futures::stream::iter(items.clone());
|
||||
pin_mut!(src);
|
||||
writer.load(src).await.expect("load");
|
||||
writer.finish().await.expect("finish write");
|
||||
@ -372,7 +368,7 @@ mod test {
|
||||
let items_iter = gen_data(5);
|
||||
let items: Vec<TestData> = items_iter.collect();
|
||||
|
||||
let src = stream_iter(items.clone().into_iter());
|
||||
let src = futures::stream::iter(items.clone());
|
||||
pin_mut!(src);
|
||||
writer.load(src).await.expect("load");
|
||||
writer.finish().await.expect("finish write");
|
||||
@ -381,13 +377,18 @@ mod test {
|
||||
assert_eq!(items.len(), reader.len());
|
||||
|
||||
let dst_stream = reader.stream();
|
||||
let src_stream = stream_iter(items.iter());
|
||||
let src_stream = futures::stream::iter(items.iter());
|
||||
|
||||
async fn test_values((x, y): (&TestData, TestData)) {
|
||||
assert_eq!(*x, y);
|
||||
}
|
||||
|
||||
src_stream.zip(dst_stream).for_each(test_values).await;
|
||||
let mut count = 0;
|
||||
src_stream
|
||||
.zip(dst_stream)
|
||||
.map(|x| {
|
||||
count += 1;
|
||||
x
|
||||
})
|
||||
.for_each(assert_data_eq)
|
||||
.await;
|
||||
assert_eq!(count, items.len())
|
||||
}
|
||||
/// sharing Reader instance between threads
|
||||
#[tokio::test]
|
||||
@ -404,7 +405,7 @@ mod test {
|
||||
let items_iter = gen_data(5);
|
||||
let items: Vec<TestData> = items_iter.collect();
|
||||
|
||||
let src = stream_iter(items.clone().into_iter());
|
||||
let src = futures::stream::iter(items.clone());
|
||||
pin_mut!(src);
|
||||
writer.load(src).await.expect("load");
|
||||
writer.finish().await.expect("finish write");
|
||||
@ -412,19 +413,15 @@ mod test {
|
||||
let reader: Reader<TestData> = Reader::new(&tmpfile, 2048).await.expect("new reader");
|
||||
assert_eq!(items.len(), reader.len());
|
||||
|
||||
async fn test_values((x, y): (&TestData, TestData)) {
|
||||
assert_eq!(*x, y);
|
||||
}
|
||||
|
||||
let reader = Arc::new(reader);
|
||||
for _ in 0..=3 {
|
||||
let cur_items = items.clone();
|
||||
let cur_reader = Arc::clone(&reader);
|
||||
tokio::spawn(async move {
|
||||
let dst_stream = cur_reader.stream();
|
||||
let src_stream = stream_iter(cur_items.iter());
|
||||
let src_stream = futures::stream::iter(cur_items.iter());
|
||||
|
||||
src_stream.zip(dst_stream).for_each(test_values).await;
|
||||
src_stream.zip(dst_stream).for_each(assert_data_eq).await;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user