From ff2b4b259818c8b083cefa72a7f8b7b37f195f6f Mon Sep 17 00:00:00 2001 From: Johannes Heuel Date: Sat, 17 Sep 2022 18:59:03 +0200 Subject: [PATCH] add drone CI cfg --- .drone.yml | 11 +++++++++++ zoidberg_server/src/main.rs | 14 ++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..779c955 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,11 @@ +kind: pipeline +type: docker +name: default + +steps: + - name: pre-commit + image: iamthefij/drone-pre-commit:latest + commands: + - curl https://sh.rustup.rs -sSf | bash -s -- -y + - export PATH="/root/.cargo/bin:$${PATH}" + - pre-commit run --all-files diff --git a/zoidberg_server/src/main.rs b/zoidberg_server/src/main.rs index a6a517f..21cb7e1 100644 --- a/zoidberg_server/src/main.rs +++ b/zoidberg_server/src/main.rs @@ -60,9 +60,7 @@ async fn status( let running_jobs = data.running_jobs.lock().unwrap(); let status_updates: Vec = running_jobs .iter() - .filter(|r| { - s.iter().filter(|i| i.id == r.id).count() > 0 - }) + .filter(|r| s.iter().filter(|i| i.id == r.id).count() > 0) .cloned() .collect(); @@ -225,22 +223,22 @@ mod tests { counter: Mutex::new(0), jobcounter: Mutex::new(0), workers: Mutex::new(Vec::new()), - jobs: Mutex::new(vec![Job { - id: 0, + jobs: Mutex::new(Vec::new()), + running_jobs: Mutex::new(vec![Job { + id: 1, cmd: cmd.clone(), status: Status::Running, }]), - running_jobs: Mutex::new(Vec::new()), })) .service(status), ) .await; let req = test::TestRequest::post() - .set_json(vec![StatusRequest { id: 0 }]) + .set_json(vec![StatusRequest { id: 1 }]) .uri("/status") .to_request(); let resp: Vec = test::call_and_read_body_json(&app, req).await; - assert_eq!(resp[0].id, 0); + assert_eq!(resp[0].id, 1); } #[actix_web::test]