]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
only close stderr if we are not testing
authorAlfredo Deza <alfredo.deza@inktank.com>
Fri, 15 Aug 2014 16:21:14 +0000 (12:21 -0400)
committerAlfredo Deza <alfredo.deza@inktank.com>
Fri, 15 Aug 2014 16:21:14 +0000 (12:21 -0400)
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
ceph_deploy/util/decorators.py

index 9565729b5ec38ad87fdf04d341142257596863ce..37fd755487df2fbca4bfdd993084eaea73f072bc 100644 (file)
@@ -1,4 +1,5 @@
 import logging
+import os
 import sys
 import traceback
 from functools import wraps
@@ -80,15 +81,16 @@ def catches(catch=None, handler=None, exit=True):
                 # This block is crucial to avoid having issues with
                 # Python spitting non-sense thread exceptions. We have already
                 # handled what we could, so close stderr and stdout.
-                import sys
-                try:
-                    sys.stdout.close()
-                except:
-                    pass
-                try:
-                    sys.stderr.close()
-                except:
-                    pass
+                if not os.environ.get('CEPH_DEPLOY_TEST'):
+                    import sys
+                    try:
+                        sys.stdout.close()
+                    except:
+                        pass
+                    try:
+                        sys.stderr.close()
+                    except:
+                        pass
 
         return newfunc