diff options
| -rw-r--r-- | pbr/packaging.py | 2 | ||||
| -rw-r--r-- | pbr/testr_command.py | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pbr/packaging.py b/pbr/packaging.py index 54a48c2..dbbfe0a 100644 --- a/pbr/packaging.py +++ b/pbr/packaging.py @@ -488,7 +488,7 @@ def override_get_script_args( import_target=ep.attrs[0], invoke_target='.'.join(ep.attrs), ) - yield (name, header+script_text) + yield (name, header + script_text) class LocalInstallScripts(install_scripts.install_scripts): diff --git a/pbr/testr_command.py b/pbr/testr_command.py index 23699dc..cf2a075 100644 --- a/pbr/testr_command.py +++ b/pbr/testr_command.py @@ -56,9 +56,10 @@ class Testr(cmd.Command): ('testr-args=', 't', "Run 'testr' with these args"), ('omit=', 'o', 'Files to omit from coverage calculations'), ('slowest', None, "Show slowest test times after tests complete."), + ('no-parallel', None, "Run testr serially"), ] - boolean_options = ['coverage', 'slowest'] + boolean_options = ['coverage', 'slowest', 'no_parallel'] def _run_testr(self, *args): return commands.run_argv([sys.argv[0]] + list(args), @@ -69,6 +70,7 @@ class Testr(cmd.Command): self.coverage = None self.omit = "" self.slowest = None + self.no_parallel = None def finalize_options(self): if self.testr_args is None: @@ -85,7 +87,10 @@ class Testr(cmd.Command): if self.coverage: self._coverage_before() - testr_ret = self._run_testr("run", "--parallel", *self.testr_args) + if not self.no_parallel: + testr_ret = self._run_testr("run", "--parallel", *self.testr_args) + else: + testr_ret = self._run_testr("run", *self.testr_args) if testr_ret: raise distutils.errors.DistutilsError( "testr failed (%d)" % testr_ret) |