jheuel/zoidberg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix tests
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Johannes Heuel
2022-09-27 15:00:12 +02:00
parent 6fd1cda2a2
commit 32bd7d5b62
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zoidberg_server/src/main.rs
View File

@@ -272,7 +272,7 @@ mod tests {
.uri("/register") .uri("/register")
.to_request(); .to_request();
let resp: RegisterResponse = test::call_and_read_body_json(&app, req).await; let resp: RegisterResponse = test::call_and_read_body_json(&app, req).await;
assert_eq!(resp.id, 1); assert!(resp.id.len() > 0);
} }
#[actix_web::test] #[actix_web::test]
@@ -282,9 +282,11 @@ mod tests {
App::new() App::new()
.app_data(String::from("secret")) .app_data(String::from("secret"))
.app_data(web::Data::new(State { .app_data(web::Data::new(State {
counter_workers: Mutex::new(0),
counter_jobs: Mutex::new(0), counter_jobs: Mutex::new(0),
workers: Mutex::new(Vec::new()), workers: Mutex::new(vec![Worker {
id: "some_worker".to_string(),
last_heartbeat: None,
}]),
new_jobs: Mutex::new(vec![Job { new_jobs: Mutex::new(vec![Job {
id: 0, id: 0,
cmd: cmd.clone(), cmd: cmd.clone(),
@@ -295,8 +297,11 @@ mod tests {
.service(fetch), .service(fetch),
) )
.await; .await;
let req = test::TestRequest::get() let req = test::TestRequest::post()
.append_header(("cookie", "secret")) .append_header(("cookie", "secret"))
.set_json(FetchRequest {
worker_id: "some_worker".to_string(),
})
.uri("/fetch") .uri("/fetch")
.to_request(); .to_request();
let resp: FetchResponse = test::call_and_read_body_json(&app, req).await; let resp: FetchResponse = test::call_and_read_body_json(&app, req).await;
@@ -321,14 +326,13 @@ mod tests {
App::new() App::new()
.app_data(String::from("secret")) .app_data(String::from("secret"))
.app_data(web::Data::new(State { .app_data(web::Data::new(State {
counter_workers: Mutex::new(0),
counter_jobs: Mutex::new(0), counter_jobs: Mutex::new(0),
workers: Mutex::new(Vec::new()), workers: Mutex::new(Vec::new()),
new_jobs: Mutex::new(Vec::new()), new_jobs: Mutex::new(Vec::new()),
jobs: Mutex::new(vec![Job { jobs: Mutex::new(vec![Job {
id: 1, id: 1,
cmd: cmd.clone(), cmd: cmd.clone(),
status: Status::Running(0), status: Status::Submitted,
}]), }]),
})) }))
.service(status), .service(status),
@@ -355,9 +359,9 @@ mod tests {
let req = test::TestRequest::post() let req = test::TestRequest::post()
.append_header(("cookie", "secret")) .append_header(("cookie", "secret"))
.set_json(vec![Update { .set_json(vec![Update {
worker: 0, worker: "some_worker".to_string(),
job: 0, job: 0,
status: Status::Running(0), status: Status::Submitted,
}]) }])
.uri("/update") .uri("/update")
.to_request(); .to_request();
@@ -379,7 +383,7 @@ mod tests {
.set_json(vec![Job { .set_json(vec![Job {
id: 0, id: 0,
cmd: String::from("hi"), cmd: String::from("hi"),
status: Status::Running(0), status: Status::Submitted,
}]) }])
.uri("/submit") .uri("/submit")
.to_request(); .to_request();