MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-04-15 00:35:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

clippy fixes to tests

Browse Source
This commit is contained in:
Scott Lamb 2025-03-11 21:45:37 -07:00
parent 2985214d87
commit 2903b680df
11 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/db/auth.rs
View File

@ -1073,8 +1073,8 @@ mod tests {
.unwrap(); .unwrap();
assert_eq!(s.use_count, 1); assert_eq!(s.use_count, 1);
let mut tx = conn.transaction().unwrap(); let tx = conn.transaction().unwrap();
state.flush(&mut tx).unwrap(); state.flush(&tx).unwrap();
tx.commit().unwrap(); tx.commit().unwrap();
state.post_flush(); state.post_flush();
@ -1224,8 +1224,8 @@ mod tests {
c.username = "foo".to_owned(); c.username = "foo".to_owned();
state.apply(&conn, c).unwrap(); state.apply(&conn, c).unwrap();
assert!(state.users_by_name.get("slamb").is_none()); assert!(!state.users_by_name.contains_key("slamb"));
assert!(state.users_by_name.get("foo").is_some()); assert!(state.users_by_name.contains_key("foo"));
} }
#[test] #[test]

11
server/db/db.rs
View File

@ -650,7 +650,7 @@ pub struct CompositeId(pub i64);
impl CompositeId { impl CompositeId {
pub fn new(stream_id: i32, recording_id: i32) -> Self { pub fn new(stream_id: i32, recording_id: i32) -> Self {
CompositeId((stream_id as i64) << 32 | recording_id as i64) CompositeId(((stream_id as i64) << 32) | recording_id as i64)
} }
pub fn stream(self) -> i32 { pub fn stream(self) -> i32 {
@ -2519,7 +2519,7 @@ mod tests {
rows = 0; rows = 0;
{ {
let db = db.lock(); let db = db.lock();
let all_time = recording::Time(i64::min_value())..recording::Time(i64::max_value()); let all_time = recording::Time(i64::MIN)..recording::Time(i64::MAX);
db.list_recordings_by_time(stream_id, all_time, &mut |_row| { db.list_recordings_by_time(stream_id, all_time, &mut |_row| {
rows += 1; rows += 1;
Ok(()) Ok(())
@ -2546,7 +2546,7 @@ mod tests {
let mut recording_id = None; let mut recording_id = None;
{ {
let db = db.lock(); let db = db.lock();
let all_time = recording::Time(i64::min_value())..recording::Time(i64::max_value()); let all_time = recording::Time(i64::MIN)..recording::Time(i64::MAX);
db.list_recordings_by_time(stream_id, all_time, &mut |row| { db.list_recordings_by_time(stream_id, all_time, &mut |row| {
rows += 1; rows += 1;
recording_id = Some(row.id); recording_id = Some(row.id);
@ -2868,9 +2868,8 @@ mod tests {
.get(&sample_file_dir_id) .get(&sample_file_dir_id)
.unwrap() .unwrap()
.garbage_unlinked .garbage_unlinked
.iter() .to_vec();
.copied()
.collect();
assert_eq!(&g, &[]); assert_eq!(&g, &[]);
} }

4
server/db/dir/mod.rs
View File

@ -421,12 +421,12 @@ mod tests {
meta.dir_uuid.extend_from_slice(fake_uuid); meta.dir_uuid.extend_from_slice(fake_uuid);
{ {
let o = meta.last_complete_open.mut_or_insert_default(); let o = meta.last_complete_open.mut_or_insert_default();
o.id = u32::max_value(); o.id = u32::MAX;
o.uuid.extend_from_slice(fake_uuid); o.uuid.extend_from_slice(fake_uuid);
} }
{ {
let o = meta.in_progress_open.mut_or_insert_default(); let o = meta.in_progress_open.mut_or_insert_default();
o.id = u32::max_value(); o.id = u32::MAX;
o.uuid.extend_from_slice(fake_uuid); o.uuid.extend_from_slice(fake_uuid);
} }
let data = meta let data = meta

2
server/db/testutil.rs
View File

@ -198,7 +198,7 @@ pub fn add_dummy_recordings_to_db(db: &db::Database, num: usize) {
wall_duration_90k: 5399985, wall_duration_90k: 5399985,
video_samples: 1800, video_samples: 1800,
video_sync_samples: 60, video_sync_samples: 60,
video_sample_entry_id: video_sample_entry_id, video_sample_entry_id,
video_index: data, video_index: data,
run_offset: 0, run_offset: 0,
..Default::default() ..Default::default()

4
server/db/writer.rs
View File

@ -1106,6 +1106,8 @@ mod tests {
enum MockFileAction { enum MockFileAction {
SyncAll(Box<dyn Fn() -> Result<(), io::Error> + Send>), SyncAll(Box<dyn Fn() -> Result<(), io::Error> + Send>),
#[allow(clippy::type_complexity)]
Write(Box<dyn Fn(&[u8]) -> Result<usize, io::Error> + Send>), Write(Box<dyn Fn(&[u8]) -> Result<usize, io::Error> + Send>),
} }
@ -1263,7 +1265,7 @@ mod tests {
&mut h.shutdown_rx, &mut h.shutdown_rx,
b"2", b"2",
recording::Time(2), recording::Time(2),
i32::max_value() as i64 + 1, i64::from(i32::MAX) + 1,
true, true,
video_sample_entry_id, video_sample_entry_id,
) )

12
server/src/mp4.rs
View File

@ -2009,7 +2009,6 @@ mod tests {
use std::fs; use std::fs;
use std::ops::Range; use std::ops::Range;
use std::path::Path; use std::path::Path;
use std::pin::Pin;
use std::str; use std::str;
use tracing::info; use tracing::info;
@ -2018,7 +2017,7 @@ mod tests {
E::Error: ::std::fmt::Debug, E::Error: ::std::fmt::Debug,
{ {
let mut p = 0; let mut p = 0;
Pin::from(e.get_range(start..start + slice.len() as u64)) e.get_range(start..start + slice.len() as u64)
.try_for_each(|mut chunk| { .try_for_each(|mut chunk| {
let len = chunk.remaining(); let len = chunk.remaining();
chunk.copy_to_slice(&mut slice[p..p + len]); chunk.copy_to_slice(&mut slice[p..p + len]);
@ -2044,7 +2043,7 @@ mod tests {
hasher.update(&b"\r\n"[..]); hasher.update(&b"\r\n"[..]);
} }
hasher.update(&b"\r\n"[..]); hasher.update(&b"\r\n"[..]);
Pin::from(e.get_range(0..e.len())) e.get_range(0..e.len())
.try_fold(hasher, |mut hasher, mut chunk| { .try_fold(hasher, |mut hasher, mut chunk| {
while chunk.has_remaining() { while chunk.has_remaining() {
let c = chunk.chunk(); let c = chunk.chunk();
@ -2157,8 +2156,7 @@ mod tests {
let interior = self.stack.last().expect("at root").interior.clone(); let interior = self.stack.last().expect("at root").interior.clone();
let len = (interior.end - interior.start) as usize; let len = (interior.end - interior.start) as usize;
trace!("get_all: start={}, len={}", interior.start, len); trace!("get_all: start={}, len={}", interior.start, len);
let mut out = Vec::with_capacity(len); let mut out = vec![0; len];
unsafe { out.set_len(len) };
fill_slice(&mut out[..], &self.mp4, interior.start).await; fill_slice(&mut out[..], &self.mp4, interior.start).await;
out out
} }
@ -2350,7 +2348,7 @@ mod tests {
builder builder
.include_timestamp_subtitle_track(include_subtitles) .include_timestamp_subtitle_track(include_subtitles)
.unwrap(); .unwrap();
let all_time = recording::Time(i64::min_value())..recording::Time(i64::max_value()); let all_time = recording::Time(i64::MIN)..recording::Time(i64::MAX);
{ {
let db = tdb.db.lock(); let db = tdb.db.lock();
db.list_recordings_by_time(TEST_STREAM_ID, all_time, &mut |r| { db.list_recordings_by_time(TEST_STREAM_ID, all_time, &mut |r| {
@ -2381,7 +2379,7 @@ mod tests {
.open(&filename) .open(&filename)
.unwrap(); .unwrap();
use ::std::io::Write; use ::std::io::Write;
Pin::from(mp4.get_range(0..mp4.len())) mp4.get_range(0..mp4.len())
.try_for_each(|mut chunk| { .try_for_each(|mut chunk| {
while chunk.has_remaining() { while chunk.has_remaining() {
let c = chunk.chunk(); let c = chunk.chunk();

6
server/src/slices.rs
View File

@ -183,7 +183,6 @@ mod tests {
use db::testutil; use db::testutil;
use futures::stream::{self, TryStreamExt}; use futures::stream::{self, TryStreamExt};
use std::ops::Range; use std::ops::Range;
use std::pin::Pin;
#[derive(Debug, Eq, PartialEq)] #[derive(Debug, Eq, PartialEq)]
pub struct FakeChunk { pub struct FakeChunk {
@ -241,10 +240,7 @@ mod tests {
async fn get_range(r: Range<u64>) -> Vec<FakeChunk> { async fn get_range(r: Range<u64>) -> Vec<FakeChunk> {
let slices = slices(); let slices = slices();
Pin::from(slices.get_range(&slices, r)) slices.get_range(&slices, r).try_collect().await.unwrap()
.try_collect()
.await
.unwrap()
} }
#[test] #[test]

7
server/src/streamer.rs
View File

@ -355,7 +355,7 @@ mod tests {
); );
let duration = goal - self.slept; let duration = goal - self.slept;
let buf_part = cmp::min(self.buffered, duration); let buf_part = cmp::min(self.buffered, duration);
self.buffered = self.buffered - buf_part; self.buffered -= buf_part;
self.clocks.sleep(duration - buf_part); self.clocks.sleep(duration - buf_part);
self.slept = goal; self.slept = goal;
} }
@ -440,8 +440,8 @@ mod tests {
Box::new(stream), Box::new(stream),
); );
stream.ts_offset = 123456; // starting pts of the input should be irrelevant stream.ts_offset = 123456; // starting pts of the input should be irrelevant
stream.ts_offset_pkts_left = u32::max_value(); stream.ts_offset_pkts_left = u32::MAX;
stream.pkts_left = u32::max_value(); stream.pkts_left = u32::MAX;
let (shutdown_tx, shutdown_rx) = base::shutdown::channel(); let (shutdown_tx, shutdown_rx) = base::shutdown::channel();
let opener = MockOpener { let opener = MockOpener {
expected_url: url::Url::parse("rtsp://test-camera/main").unwrap(), expected_url: url::Url::parse("rtsp://test-camera/main").unwrap(),
@ -516,7 +516,6 @@ mod tests {
assert_eq!(recording::Time(128700576719993), recordings[1].start); assert_eq!(recording::Time(128700576719993), recordings[1].start);
assert_eq!(db::RecordingFlags::TrailingZero as i32, recordings[1].flags); assert_eq!(db::RecordingFlags::TrailingZero as i32, recordings[1].flags);
drop(env);
drop(opener); drop(opener);
} }
} }

2
server/src/web/mod.rs
View File

@ -755,7 +755,7 @@ mod tests {
let s = Server::new(None); let s = Server::new(None);
let cli = reqwest::Client::new(); let cli = reqwest::Client::new();
let resp = cli let resp = cli
.get(&format!("{}/api/", &s.base_url)) .get(format!("{}/api/", &s.base_url))
.send() .send()
.await .await
.unwrap(); .unwrap();

14
server/src/web/session.rs
View File

@ -175,7 +175,7 @@ mod tests {
info!("header: {}", cookie.header()); info!("header: {}", cookie.header());
let resp = cli let resp = cli
.get(&format!("{}/api/", &s.base_url)) .get(format!("{}/api/", &s.base_url))
.header(reqwest::header::COOKIE, cookie.header()) .header(reqwest::header::COOKIE, cookie.header())
.send() .send()
.await .await
@ -192,7 +192,7 @@ mod tests {
p.insert("username", "slamb"); p.insert("username", "slamb");
p.insert("password", "hunter2"); p.insert("password", "hunter2");
let resp = cli let resp = cli
.post(&format!("{}/api/login", &s.base_url)) .post(format!("{}/api/login", &s.base_url))
.json(&p) .json(&p)
.send() .send()
.await .await
@ -202,7 +202,7 @@ mod tests {
// A GET shouldn't work. // A GET shouldn't work.
let resp = cli let resp = cli
.get(&format!("{}/api/logout", &s.base_url)) .get(format!("{}/api/logout", &s.base_url))
.header(reqwest::header::COOKIE, cookie.header()) .header(reqwest::header::COOKIE, cookie.header())
.send() .send()
.await .await
@ -211,7 +211,7 @@ mod tests {
// Neither should a POST without a csrf token. // Neither should a POST without a csrf token.
let resp = cli let resp = cli
.post(&format!("{}/api/logout", &s.base_url)) .post(format!("{}/api/logout", &s.base_url))
.header(reqwest::header::COOKIE, cookie.header()) .header(reqwest::header::COOKIE, cookie.header())
.send() .send()
.await .await
@ -221,7 +221,7 @@ mod tests {
// But it should work with the csrf token. // But it should work with the csrf token.
// Retrieve that from the toplevel API request. // Retrieve that from the toplevel API request.
let toplevel: serde_json::Value = cli let toplevel: serde_json::Value = cli
.post(&format!("{}/api/", &s.base_url)) .post(format!("{}/api/", &s.base_url))
.header(reqwest::header::COOKIE, cookie.header()) .header(reqwest::header::COOKIE, cookie.header())
.send() .send()
.await .await
@ -240,7 +240,7 @@ mod tests {
let mut p = FastHashMap::default(); let mut p = FastHashMap::default();
p.insert("csrf", csrf); p.insert("csrf", csrf);
let resp = cli let resp = cli
.post(&format!("{}/api/logout", &s.base_url)) .post(format!("{}/api/logout", &s.base_url))
.header(reqwest::header::COOKIE, cookie.header()) .header(reqwest::header::COOKIE, cookie.header())
.json(&p) .json(&p)
.send() .send()
@ -255,7 +255,7 @@ mod tests {
// It should also be invalidated server-side. // It should also be invalidated server-side.
let resp = cli let resp = cli
.get(&format!("{}/api/", &s.base_url)) .get(format!("{}/api/", &s.base_url))
.header(reqwest::header::COOKIE, cookie.header()) .header(reqwest::header::COOKIE, cookie.header())
.send() .send()
.await .await

2
server/src/web/view.rs
View File

@ -291,7 +291,7 @@ mod tests {
let s = Server::new(Some(permissions)); let s = Server::new(Some(permissions));
let cli = reqwest::Client::new(); let cli = reqwest::Client::new();
let resp = cli let resp = cli
.get(&format!( .get(format!(
"{}/api/cameras/{}/main/view.mp4", "{}/api/cameras/{}/main/view.mp4",
&s.base_url, s.db.test_camera_uuid &s.base_url, s.db.test_camera_uuid
)) ))