This commit is contained in:
11
.drone.yml
Normal file
11
.drone.yml
Normal file
@@ -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
|
||||||
@@ -60,9 +60,7 @@ async fn status(
|
|||||||
let running_jobs = data.running_jobs.lock().unwrap();
|
let running_jobs = data.running_jobs.lock().unwrap();
|
||||||
let status_updates: Vec<Job> = running_jobs
|
let status_updates: Vec<Job> = running_jobs
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|r| {
|
.filter(|r| s.iter().filter(|i| i.id == r.id).count() > 0)
|
||||||
s.iter().filter(|i| i.id == r.id).count() > 0
|
|
||||||
})
|
|
||||||
.cloned()
|
.cloned()
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
@@ -225,22 +223,22 @@ mod tests {
|
|||||||
counter: Mutex::new(0),
|
counter: Mutex::new(0),
|
||||||
jobcounter: Mutex::new(0),
|
jobcounter: Mutex::new(0),
|
||||||
workers: Mutex::new(Vec::new()),
|
workers: Mutex::new(Vec::new()),
|
||||||
jobs: Mutex::new(vec![Job {
|
jobs: Mutex::new(Vec::new()),
|
||||||
id: 0,
|
running_jobs: Mutex::new(vec![Job {
|
||||||
|
id: 1,
|
||||||
cmd: cmd.clone(),
|
cmd: cmd.clone(),
|
||||||
status: Status::Running,
|
status: Status::Running,
|
||||||
}]),
|
}]),
|
||||||
running_jobs: Mutex::new(Vec::new()),
|
|
||||||
}))
|
}))
|
||||||
.service(status),
|
.service(status),
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
let req = test::TestRequest::post()
|
let req = test::TestRequest::post()
|
||||||
.set_json(vec![StatusRequest { id: 0 }])
|
.set_json(vec![StatusRequest { id: 1 }])
|
||||||
.uri("/status")
|
.uri("/status")
|
||||||
.to_request();
|
.to_request();
|
||||||
let resp: Vec<Job> = test::call_and_read_body_json(&app, req).await;
|
let resp: Vec<Job> = test::call_and_read_body_json(&app, req).await;
|
||||||
assert_eq!(resp[0].id, 0);
|
assert_eq!(resp[0].id, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[actix_web::test]
|
#[actix_web::test]
|
||||||
|
|||||||
Reference in New Issue
Block a user