From 5688c064ad757006bb268bb1e4d1ce6c120df0cd Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Wed, 11 Dec 2013 09:50:17 +1100
Subject: [PATCH] ENH: separate out log capture framework for other test cases
 - now utils.LogCaptureTestCase

---
 testcases/actiontestcase.py | 27 +++++----------------------
 testcases/utils.py          | 29 ++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/testcases/actiontestcase.py b/testcases/actiontestcase.py
index 14356ee5..e0587b3d 100644
--- a/testcases/actiontestcase.py
+++ b/testcases/actiontestcase.py
@@ -24,40 +24,23 @@ __author__ = "Cyril Jaquier"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"
 
-import unittest, time
+import time
 import logging, sys
 from server.action import Action
-from StringIO import StringIO
+from utils import LogCaptureTestCase
 
-class ExecuteAction(unittest.TestCase):
+class ExecuteAction(LogCaptureTestCase):
 
 	def setUp(self):
 		"""Call before every test case."""
 		self.__action = Action("Test")
-
-		# For extended testing of what gets output into logging
-		# system, we will redirect it to a string
-		logSys = logging.getLogger("fail2ban")
-
-		# Keep old settings
-		self._old_level = logSys.level
-		self._old_handlers = logSys.handlers
-		# Let's log everything into a string
-		self._log = StringIO()
-		logSys.handlers = [logging.StreamHandler(self._log)]
-		logSys.setLevel(getattr(logging, 'DEBUG'))
+		LogCaptureTestCase.setUp(self)
 
 	def tearDown(self):
 		"""Call after every test case."""
-		# print "O: >>%s<<" % self._log.getvalue()
-		logSys = logging.getLogger("fail2ban")
-		logSys.handlers = self._old_handlers
-		logSys.level = self._old_level
+		LogCaptureTestCase.tearDown(self)
 		self.__action.execActionStop()
 
-	def _is_logged(self, s):
-		return s in self._log.getvalue()
-
 	def testNameChange(self):
 		self.assertEqual(self.__action.getName(), "Test")
 		self.__action.setName("Tricky Test")
diff --git a/testcases/utils.py b/testcases/utils.py
index 643c9ad1..b048c8c6 100644
--- a/testcases/utils.py
+++ b/testcases/utils.py
@@ -22,8 +22,9 @@ __author__ = "Yaroslav Halchenko"
 __copyright__ = "Copyright (c) 2013 Yaroslav Halchenko"
 __license__ = "GPL"
 
-import logging, os, re, tempfile, sys, time, traceback
+import unittest, logging, os, re, tempfile, sys, time, traceback
 from os.path import basename, dirname
+from StringIO import StringIO
 
 #
 # Following "traceback" functions are adopted from PyMVPA distributed
@@ -105,3 +106,29 @@ def mtimesleep():
 	# no sleep now should be necessary since polling tracks now not only
 	# mtime but also ino and size
 	pass
+
+class LogCaptureTestCase(unittest.TestCase):
+
+	def setUp(self):
+
+		# For extended testing of what gets output into logging
+		# system, we will redirect it to a string
+		logSys = logging.getLogger("fail2ban")
+
+		# Keep old settings
+		self._old_level = logSys.level
+		self._old_handlers = logSys.handlers
+		# Let's log everything into a string
+		self._log = StringIO()
+		logSys.handlers = [logging.StreamHandler(self._log)]
+		logSys.setLevel(getattr(logging, 'DEBUG'))
+
+	def tearDown(self):
+		"""Call after every test case."""
+		# print "O: >>%s<<" % self._log.getvalue()
+		logSys = logging.getLogger("fail2ban")
+		logSys.handlers = self._old_handlers
+		logSys.level = self._old_level
+
+	def _is_logged(self, s):
+		return s in self._log.getvalue()