From 53be2ade863d0ead9ca53566fad2ef8684f80399 Mon Sep 17 00:00:00 2001
From: Steven Hiscocks <steven@hiscocks.me.uk>
Date: Sat, 23 Feb 2013 21:05:23 +0000
Subject: [PATCH] Wrap open method to allow python3 to ignore unicode errors

---
 testcases/filtertestcase.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/testcases/filtertestcase.py b/testcases/filtertestcase.py
index 3b764729..8ab3fca8 100644
--- a/testcases/filtertestcase.py
+++ b/testcases/filtertestcase.py
@@ -27,6 +27,7 @@ import os
 import sys
 import time
 import tempfile
+import functools
 
 from server.jail import Jail
 from server.filterpoll import FilterPoll
@@ -38,6 +39,11 @@ from server.failmanager import FailManagerEmpty
 # Useful helpers
 #
 
+if sys.version_info >= (3,):
+	open_ = functools.partial(open, errors='ignore')
+else:
+	open_ = open
+
 def _killfile(f, name):
 	try:
 		f.close()
@@ -104,9 +110,9 @@ def _copy_lines_between_files(fin, fout, n=None, skip=0, mode='a', terminal_line
 		# polling filter could detect the change
 		time.sleep(1)
 	if isinstance(fin, str):
-		fin = open(fin, 'r')
+		fin = open_(fin, 'r')
 	if isinstance(fout, str):
-		fout = open(fout, mode)
+		fout = open_(fout, mode)
 	# Skip
 	for i in xrange(skip):
 		_ = fin.readline()
@@ -184,7 +190,7 @@ class LogFileMonitor(unittest.TestCase):
 		"""Call before every test case."""
 		self.filter = self.name = 'NA'
 		_, self.name = tempfile.mkstemp('fail2ban', 'monitorfailures')
-		self.file = open(self.name, 'a')
+		self.file = open_(self.name, 'a')
 		self.filter = FilterPoll(None)
 		self.filter.addLogPath(self.name)
 		self.filter.setActive(True)
@@ -226,7 +232,7 @@ class LogFileMonitor(unittest.TestCase):
 		# we are not signaling as modified whenever
 		# it gets away
 		self.assertTrue(self.notModified())
-		f = open(self.name, 'a')
+		f = open_(self.name, 'a')
 		self.assertTrue(self.isModified())
 		self.assertTrue(self.notModified())
 		_sleep_4_poll()
@@ -329,7 +335,7 @@ def get_monitor_failures_testcase(Filter_):
 			"""Call before every test case."""
 			self.filter = self.name = 'NA'
 			_, self.name = tempfile.mkstemp('fail2ban', 'monitorfailures')
-			self.file = open(self.name, 'a')
+			self.file = open_(self.name, 'a')
 			self.jail = DummyJail()
 			self.filter = Filter_(self.jail)
 			self.filter.addLogPath(self.name)
@@ -454,7 +460,7 @@ def get_monitor_failures_testcase(Filter_):
 			self.assert_correct_last_attempt(GetFailures.FAILURES_01)
 
 			# create a bogus file in the same directory and see if that doesn't affect
-			open(self.name + '.bak2', 'w').write('')
+			open_(self.name + '.bak2', 'w').write('')
 			_copy_lines_between_files(GetFailures.FILENAME_01, self.name, n=100)
 			self.assert_correct_last_attempt(GetFailures.FAILURES_01)
 			self.assertEqual(self.filter.failManager.getFailTotal(), 6)