Skip to content

Commit 27b3e14

Browse files
committed
Cleanup write_run_finish().
1 parent 5d2056a commit 27b3e14

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

src/libtest/lib.rs

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -624,34 +624,14 @@ impl<T: Writer> ConsoleTestState<T> {
624624
Ok(())
625625
}
626626

627-
pub fn write_run_finish(&mut self,
628-
ratchet_metrics: &Option<Path>,
629-
ratchet_pct: Option<f64>) -> io::IoResult<bool> {
627+
pub fn write_run_finish(&mut self) -> io::IoResult<bool> {
630628
assert!(self.passed + self.failed + self.ignored + self.measured == self.total);
631629

632-
let ratchet_success = match *ratchet_metrics {
633-
None => true,
634-
Some(ref pth) => {
635-
try!(self.write_plain(format!("\nusing metrics ratchet: {:?}\n",
636-
pth.display()).as_slice()));
637-
match ratchet_pct {
638-
None => (),
639-
Some(pct) =>
640-
try!(self.write_plain(format!("with noise-tolerance \
641-
forced to: {}%\n",
642-
pct).as_slice()))
643-
}
644-
true
645-
}
646-
};
647-
648-
let test_success = self.failed == 0u;
649-
if !test_success {
630+
let success = self.failed == 0u;
631+
if !success {
650632
try!(self.write_failures());
651633
}
652634

653-
let success = ratchet_success && test_success;
654-
655635
try!(self.write_plain("\ntest result: "));
656636
if success {
657637
// 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
745725
None => {}
746726
}
747727
try!(run_tests(opts, tests, |x| callback(&x, &mut st)));
748-
return st.write_run_finish(&None, None);
728+
return st.write_run_finish();
749729
}
750730

751731
#[test]

0 commit comments

Comments
 (0)