From 27b3e14d7fa5f6e07f38ca174daed489edcfc113 Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Wed, 21 Jan 2015 01:45:24 -0800 Subject: [PATCH] Cleanup write_run_finish(). --- src/libtest/lib.rs | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 98e031f863e8..86a92f0ac8f6 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -624,34 +624,14 @@ impl ConsoleTestState { Ok(()) } - pub fn write_run_finish(&mut self, - ratchet_metrics: &Option, - ratchet_pct: Option) -> io::IoResult { + pub fn write_run_finish(&mut self) -> io::IoResult { assert!(self.passed + self.failed + self.ignored + self.measured == self.total); - let ratchet_success = match *ratchet_metrics { - None => true, - 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 { + let success = self.failed == 0u; + if !success { try!(self.write_failures()); } - let success = ratchet_success && test_success; - try!(self.write_plain("\ntest result: ")); if success { // 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 ) -> io::IoR None => {} } try!(run_tests(opts, tests, |x| callback(&x, &mut st))); - return st.write_run_finish(&None, None); + return st.write_run_finish(); } #[test]