research/psboard-qaqc-postprocess
1
0
Fork 0
mirror of https://gitlab.cern.ch/wotsubo/psboard-qaqc-postprocess.git synced 2024-11-21 23:00:20 +09:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: master log parse (invalid station detection in status parse)

Browse source 
- missed switch for `Station1`
- added integrated test to check lines count of output csv
This commit is contained in:
Wataru Otsubo 2024-07-23 22:38:22 +09:00
parent e20c029684
commit fb5160d2d9
2 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/masterlog.rs
View file

@ -2,7 +2,7 @@ use std::{collections::BTreeMap, io::BufRead, str::FromStr};
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use log::{debug, info, trace}; use log::{debug, error, info, trace};
use regex::Regex; use regex::Regex;
use semver::Version; use semver::Version;
@ -123,7 +123,9 @@ impl MasterLogResult {
debug!("End of assignments"); debug!("End of assignments");
break; break;
} }
debug!("line: {}", line);
let (pos, id) = extract_position_id(&line)?; let (pos, id) = extract_position_id(&line)?;
trace!("pos: {}", pos);
match assignments.insert(pos.clone(), id) { match assignments.insert(pos.clone(), id) {
None => (), None => (),
Some(old_id) => { Some(old_id) => {
@ -163,9 +165,17 @@ impl MasterLogResult {
let mut board_results = BTreeMap::new(); let mut board_results = BTreeMap::new();
for station_minor in [0, 1] { for station_minor in [0, 1] {
info!("Result for {:?}", station_minor); info!("Result for {:?}", station_minor);
for _ in 1..10 {
// Loop for sufficiently large number to reach `Station1`
for _ in 1..20 {
let line = lines.next().context("Invalid log format(result body)")??; let line = lines.next().context("Invalid log format(result body)")??;
if line.contains("Station1") || line.contains("======") { trace!("line: {}", line);
if line.contains("======") {
// end of status
break;
}
if line.contains(&format!("Station{}", station_minor + 1)) {
debug!("Next station: line: {}", line);
break; break;
} }
let parts: Vec<&str> = line.split('|').collect(); let parts: Vec<&str> = line.split('|').collect();
@ -182,7 +192,7 @@ impl MasterLogResult {
.parse::<u8>() .parse::<u8>()
}) })
} }
.context("Invalid station format")??; .context(format!("Invalid station format: {}", line))??;
let station_id = match station_minor { let station_id = match station_minor {
0 => raw_station_id, 0 => raw_station_id,
1 => raw_station_id - 10, 1 => raw_station_id - 10,
@ -283,14 +293,8 @@ mod test {
#[test] #[test]
fn parse_runid_line() { fn parse_runid_line() {
assert_eq!( assert_eq!(extract_runid_line("QAQC runid: 7").unwrap(), 7);
extract_runid_line("QAQC runid: 7").unwrap(), assert_eq!(extract_runid_line("QAQC runid: 12345").unwrap(), 12345);
7
);
assert_eq!(
extract_runid_line("QAQC runid: 12345").unwrap(),
12345
);
} }
#[test] #[test]

23
tests/cli.rs
View file

@ -7,6 +7,7 @@ mod integrated_test {
use anyhow::Result; use anyhow::Result;
use assert_cmd::Command; use assert_cmd::Command;
use itertools::Itertools;
use predicates::prelude::*; use predicates::prelude::*;
#[test] #[test]
@ -26,17 +27,21 @@ mod integrated_test {
// check output // check output
{ {
// check output content
let f = File::open(test_out.clone())?; let f = File::open(test_out.clone())?;
let r = BufReader::new(f); let r = BufReader::new(f);
assert!(r assert!(r.lines().any(|line| {
.lines() line.unwrap().contains(
.any(|line| { "8866,,B-0-1,0,1,1,0,1,8,1,,7,2024-07-20T17:15:46Z,7.log,0.1.0,alice,,,,",
line )
.unwrap() }));
.contains( }
"8866,,B-0-1,0,1,1,0,1,8,1,,7,2024-07-20T17:15:46Z,7.log,0.1.0,alice,,,," {
) // Check output lines count
})); let f = File::open(test_out.clone())?;
let r = BufReader::new(f);
let lc = r.lines().collect_vec().len();
assert_eq!(lc, 19);
} }
// 2nd file // 2nd file