Merge commit '0.8.8-312-g7a6eecb' into 0.9

* commit '0.8.8-312-g7a6eecb':
  ENH: close open file in a test
pull/220/merge
Yaroslav Halchenko 2013-05-09 13:25:41 -04:00
commit 709b437b7d
1 changed files with 7 additions and 5 deletions

View File

@ -615,17 +615,19 @@ class GetFailures(unittest.TestCase):
def testCRLFFailures01(self): def testCRLFFailures01(self):
# We first adjust logfile/failures to end with CR+LF # We first adjust logfile/failures to end with CR+LF
fname = tempfile.mktemp(prefix='tmp_fail2ban', suffix='crlf') fname = tempfile.mktemp(prefix='tmp_fail2ban', suffix='crlf')
f = open(fname, 'w') # poor man unix2dos:
for l in open(GetFailures.FILENAME_01).readlines(): fin, fout = open(GetFailures.FILENAME_01), open(fname, 'w')
f.write('%s\r\n' % l.rstrip('\n')) for l in fin.readlines():
f.close() fout.write('%s\r\n' % l.rstrip('\n'))
fin.close()
fout.close()
# now see if we should be getting the "same" failures # now see if we should be getting the "same" failures
self.testGetFailures01(filename=fname, self.testGetFailures01(filename=fname,
failures=GetFailures.FAILURES_01[:3] + failures=GetFailures.FAILURES_01[:3] +
([x.rstrip('\n') + '\r\n' for x in ([x.rstrip('\n') + '\r\n' for x in
GetFailures.FAILURES_01[-1]],)) GetFailures.FAILURES_01[-1]],))
_killfile(f, fname) _killfile(fout, fname)
def testGetFailures02(self): def testGetFailures02(self):