diff options
author | Lars Wirzenius <liw@liw.fi> | 2012-02-24 14:30:49 +0000 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2012-02-24 14:30:49 +0000 |
commit | f586260a2d7f8304e1c0f48c127836bd9ea0b471 (patch) | |
tree | 14862db0d989c23d3f6b17b0bf53718c17421c3f | |
parent | d739676f0de8ddbdd5cac437ca243e424bf93062 (diff) | |
download | cmdtest-f586260a2d7f8304e1c0f48c127836bd9ea0b471.tar.gz |
Fix progress reporting countercmdtest-0.3
-rwxr-xr-x | cmdtest | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -54,14 +54,13 @@ class CommandTester(cliapp.Application): self.settings.boolean(['keep', 'k'], 'keep temporary data on failure') def process_args(self, dirnames): - self.setup_ttystatus() self.timings = {} self.timings[ALL_TESTS] = {} suite_started = time.time() td = self.load_tests(dirnames) - self.ts['tests'] = td.tests + self.setup_ttystatus(td) errors = 0 self.setup_tempdir() @@ -69,7 +68,8 @@ class CommandTester(cliapp.Application): for test in td.tests: self.timings[test.name] = {} started = time.time() - self.ts['test'] = test.name + self.ts['test'] = test + self.ts['test-name'] = test.name self.run_script(test.name, td.setup) for e in self.run_test(test): logging.error(str(e)) @@ -100,9 +100,10 @@ class CommandTester(cliapp.Application): if errors: sys.exit(1) - def setup_ttystatus(self): + def setup_ttystatus(self, td): self.ts = ttystatus.TerminalStatus(period=0.001) - self.ts.format('test %Index(test,tests): %String(test)') + self.ts['tests'] = td.tests + self.ts.format('test %Index(test,tests): %String(test-name)') def load_tests(self, dirnames): td = cmdtestlib.TestDir() |