valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix salt.utils.fopen import error.

Browse Source
This commit is contained in:
Pedro Algarvio 2012-11-23 12:32:40 +00:00
parent a6fd9bb60f
commit 4fc12f58ee
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/saltunittest.py
View File

@ -13,9 +13,6 @@ import sys
import logging
from functools import wraps
# Import salt libs
from salt.utils import fopen
# support python < 2.7 via unittest2
if sys.version_info[0:2] < (2, 7):
try:
@ -67,9 +64,9 @@ class RedirectStdStreams(object):
def __init__(self, stdout=None, stderr=None):
if stdout is None:
stdout = fopen(os.devnull, 'w')
stdout = open(os.devnull, 'w')
if stderr is None:
stderr = fopen(os.devnull, 'w')
stderr = open(os.devnull, 'w')
self.__stdout = stdout
self.__stderr = stderr
@ -95,7 +92,9 @@ class RedirectStdStreams(object):
return
self.__stdout.flush()
self.__stdout.close()
self.__stderr.flush()
self.__stderr.close()
sys.stdout = self.old_stdout
sys.stderr = self.old_stderr