MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-03-13 21:12:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

unbreak test --features=nightly

Browse Source
This commit is contained in:
Scott Lamb 2019-06-20 14:57:13 -07:00
parent 644ea4e6ea
commit abf4eba42d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mp4.rs
View File

@ -2262,7 +2262,8 @@ mod bench {
let addr = "127.0.0.1:0".parse().unwrap();
let server = hyper::server::Server::bind(&addr)
.tcp_nodelay(true)
.serve(move || Ok::<_, Box<StdError + Send + Sync>>(MyService(mp4.clone())));
.serve(move || Ok::<_, Box<dyn StdError + Send + Sync>>(
MyService(mp4.clone())));
tx.send(server.local_addr()).unwrap();
::tokio::run(server.map_err(|e| panic!(e)));
});

5
src/web.rs
View File

@ -1393,17 +1393,16 @@ mod bench {
let test_camera_uuid = db.test_camera_uuid;
testutil::add_dummy_recordings_to_db(&db.db, 1440);
let addr = "127.0.0.1:0".parse().unwrap();
let require_auth = false;
let service = super::Service::new(super::Config {
db: db.db.clone(),
ui_dir: None,
require_auth,
allow_unauthenticated_permissions: Some(db::Permissions::default()),
trust_forward_hdrs: false,
time_zone_name: "".to_owned(),
}).unwrap();
let server = hyper::server::Server::bind(&addr)
.tcp_nodelay(true)
.serve(move || Ok::<_, Box<StdError + Send + Sync>>(service.clone()));
.serve(move || Ok::<_, Box<dyn StdError + Send + Sync>>(service.clone()));
let addr = server.local_addr(); // resolve port 0 to a real ephemeral port number.
::std::thread::spawn(move || {
::tokio::run(server.map_err(|e| panic!(e)));