diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2013-07-08 16:29:33 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2013-07-08 16:29:33 -0500 |
commit | f24ee0bb658d2102c731960a78478687c22cc517 (patch) | |
tree | d9825dcc873f7adcdf615a96ab8f67881265a595 /src/sbin/bcfg2-test | |
parent | 8bc0d778d5792e89451bd986831ca4ea10bfa39b (diff) | |
parent | a0f20bdde06ccb7be85f59e1b8fbf57e1c492e64 (diff) | |
download | bcfg2-f24ee0bb658d2102c731960a78478687c22cc517.tar.gz bcfg2-f24ee0bb658d2102c731960a78478687c22cc517.tar.bz2 bcfg2-f24ee0bb658d2102c731960a78478687c22cc517.zip |
Merge branch 'maint'
Conflicts:
src/lib/Bcfg2/settings.py
src/sbin/bcfg2-crypt
Diffstat (limited to 'src/sbin/bcfg2-test')
-rwxr-xr-x | src/sbin/bcfg2-test | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test index 735a6c49c..4aa495c98 100755 --- a/src/sbin/bcfg2-test +++ b/src/sbin/bcfg2-test @@ -299,8 +299,8 @@ def main(): for client in clients: yield ClientTest(core, client, ignore) - TestProgram(argv=sys.argv[:1] + core.setup['noseopts'], - suite=LazySuite(generate_tests), exit=False) + result = TestProgram(argv=sys.argv[:1] + core.setup['noseopts'], + suite=LazySuite(generate_tests), exit=False) # block until all children have completed -- should be # immediate since we've already gotten all the results we @@ -309,7 +309,10 @@ def main(): child.join() core.shutdown() - os._exit(0) # pylint: disable=W0212 + if result.success: + os._exit(0) # pylint: disable=W0212 + else: + os._exit(1) # pylint: disable=W0212 if __name__ == "__main__": |