Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ekaterina Tuzova
2014-08-04 15:01:20 +04:00
842 changed files with 5631 additions and 603 deletions
+6 -2
View File
@@ -141,7 +141,11 @@ class _BehaveRunner(_bdd_utils.BddRunner):
elif element.status == 'passed':
self._test_passed(element.name, element.duration)
elif element.status == 'failed':
self._test_failed(element.name, element.error_message, traceback.format_exc())
try:
trace = traceback.format_exc()
except Exception:
trace = "".join(traceback.format_tb(element.exc_traceback))
self._test_failed(element.name, element.error_message, trace)
elif element.status == 'undefined':
self._test_undefined(element.name, element.location)
else:
@@ -231,7 +235,7 @@ if __name__ == "__main__":
if not my_config.paths: # No path provided, trying to load dit manually
if os.path.isfile(what_to_run): # File is provided, load it
my_config.paths = [what_to_run]
else: # Dir is provided, find subdirs ro run
else: # Dir is provided, find subdirs ro run
my_config.paths = _get_dirs_to_run(base_dir)
_BehaveRunner(my_config, base_dir).run()