Cleanup write_run_finish().

This commit is contained in:
Ahmed Charles 2015-01-21 01:45:24 -08:00
parent 5d2056a7e3
commit 27b3e14d7f

View file

@ -624,34 +624,14 @@ impl<T: Writer> ConsoleTestState<T> {
Ok(()) Ok(())
} }
pub fn write_run_finish(&mut self, pub fn write_run_finish(&mut self) -> io::IoResult<bool> {
ratchet_metrics: &Option<Path>,
ratchet_pct: Option<f64>) -> io::IoResult<bool> {
assert!(self.passed + self.failed + self.ignored + self.measured == self.total); assert!(self.passed + self.failed + self.ignored + self.measured == self.total);
let ratchet_success = match *ratchet_metrics { let success = self.failed == 0u;
None => true, if !success {
Some(ref pth) => {
try!(self.write_plain(format!("\nusing metrics ratchet: {:?}\n",
pth.display()).as_slice()));
match ratchet_pct {
None => (),
Some(pct) =>
try!(self.write_plain(format!("with noise-tolerance \
forced to: {}%\n",
pct).as_slice()))
}
true
}
};
let test_success = self.failed == 0u;
if !test_success {
try!(self.write_failures()); try!(self.write_failures());
} }
let success = ratchet_success && test_success;
try!(self.write_plain("\ntest result: ")); try!(self.write_plain("\ntest result: "));
if success { if success {
// There's no parallelism at this point so it's safe to use color // There's no parallelism at this point so it's safe to use color
@ -745,7 +725,7 @@ pub fn run_tests_console(opts: &TestOpts, tests: Vec<TestDescAndFn> ) -> io::IoR
None => {} None => {}
} }
try!(run_tests(opts, tests, |x| callback(&x, &mut st))); try!(run_tests(opts, tests, |x| callback(&x, &mut st)));
return st.write_run_finish(&None, None); return st.write_run_finish();
} }
#[test] #[test]