Modernize test assertions

Signed-off-by: Michał Górny <mgorny@gentoo.org>

8 files changed, 38 insertions, 38 deletions

diff --git a/pym/gentoolkit/cpv.py b/pym/gentoolkit/cpv.py
index 169c833..2e8e167 100644
--- a/pym/gentoolkit/cpv.py
+++ b/pym/gentoolkit/cpv.py
@@ -28,8 +28,8 @@ from gentoolkit import errors
 # Globals
 # =======
 
-isvalid_version_re = re.compile(r"^(?:cvs\\.)?(?:\\d+)(?:\\.\\d+)*[a-z]?"
-	r"(?:_(p(?:re)?|beta|alpha|rc)\\d*)*$")
+isvalid_version_re = re.compile(r"^(?:cvs\.)?(?:\d+)(?:\.\d+)*[a-z]?"
+	r"(?:_(p(?:re)?|beta|alpha|rc)\d*)*$")
 isvalid_cat_re = re.compile(r"^(?:[a-zA-Z0-9][-a-zA-Z0-9+._]*(?:/(?!$))?)+$")
 _pkg_re = re.compile(r"^[a-zA-Z0-9+._]+$")
 # Prefix specific revision is of the form -r0<digit>+.<digit>+
diff --git a/pym/gentoolkit/revdep_rebuild/settings.py b/pym/gentoolkit/revdep_rebuild/settings.py
index ca8d5fa..718fee7 100644
--- a/pym/gentoolkit/revdep_rebuild/settings.py
+++ b/pym/gentoolkit/revdep_rebuild/settings.py
@@ -151,15 +151,15 @@ def parse_revdep_config(revdep_confdir):
 			line = line.strip()
 			#first check for comment, we do not want to regex all lines
 			if not line.startswith('#'):
-				match = re.match(r'LD_LIBRARY_MASK=\\"([^"]+)\\"', line)
+				match = re.match(r'LD_LIBRARY_MASK=\"([^"]+)"', line)
 				if match is not None:
 					masked_files += ' ' + match.group(1)
 					continue
-				match = re.match(r'SEARCH_DIRS_MASK=\\"([^"]+)\\"', line)
+				match = re.match(r'SEARCH_DIRS_MASK=\"([^"]+)"', line)
 				if match is not None:
 					masked_dirs += ' ' + match.group(1)
 					continue
-				match = re.match(r'SEARCH_DIRS=\\"([^"]+)\\"', line)
+				match = re.match(r'SEARCH_DIRS="([^"]+)"', line)
 				if match is not None:
 					search_dirs += ' ' + match.group(1)
 					continue
diff --git a/pym/gentoolkit/test/eclean/test_search.py b/pym/gentoolkit/test/eclean/test_search.py
index 4533909..6dc26a2 100755
--- a/pym/gentoolkit/test/eclean/test_search.py
+++ b/pym/gentoolkit/test/eclean/test_search.py
@@ -166,12 +166,12 @@ class TestCheckLimits(unittest.TestCase):
 			test['results'].sort()
 			#print("actual=", run_results[i])
 			#print("should-be=", test['results'])
-			self.failUnlessEqual(run_results[i], test["results"],
+			self.assertEqual(run_results[i], test["results"],
 				"/ntest_check_limits, test# %d, test=%s, diff=%s"
 				%(i, test['test'], str(set(run_results[i]).difference(test['results'])))
 			)
 			test['output'].sort()
-			self.failUnlessEqual(run_callbacks[i], test['output'])
+			self.assertEqual(run_callbacks[i], test['output'])
 
 
 class TestFetchRestricted(unittest.TestCase):
@@ -290,7 +290,7 @@ class TestFetchRestricted(unittest.TestCase):
 				else:
 					test = "FAILED"
 				print("comparing %s, %s" %(key, item), test)
-				self.failUnlessEqual(sorted(testdata[item]), sorted(results[item]),
+				self.assertEqual(sorted(testdata[item]), sorted(results[item]),
 					"\n%s: %s %s data does not match\nresult=" %(test_name, key, item) +\
 					str(results[item]) + "\ntestdata=" + str(testdata[item]))
 
@@ -530,7 +530,7 @@ class TestNonDestructive(unittest.TestCase):
 				print("comparing %s, %s..." %(key, item), test)
 				if test == "FAILED":
 					print("", sorted(results[item]), "\n",  sorted(testdata[item]))
-				self.failUnlessEqual(sorted(testdata[item]), sorted(results[item]),
+				self.assertEqual(sorted(testdata[item]), sorted(results[item]),
 					"\n%s: %s, %s data does not match\n"
 					%(test_name, key, item) + \
 					"result=" + str(results[item]) + "\ntestdata=" + str(testdata[item])
@@ -609,7 +609,7 @@ class TestRemoveProtected(unittest.TestCase):
 
 	def test_remove_protected(self):
 		results = self.target_class._remove_protected(PKGS, CLEAN_ME)
-		self.failUnlessEqual(results, self.results,
+		self.assertEqual(results, self.results,
 			"\ntest_remove_protected: data does not match\nresult=" +\
 			str(results) + "\ntestdata=" + str(self.results))
 
diff --git a/pym/gentoolkit/test/equery/test_init.py b/pym/gentoolkit/test/equery/test_init.py
index 22db564..075f653 100644
--- a/pym/gentoolkit/test/equery/test_init.py
+++ b/pym/gentoolkit/test/equery/test_init.py
@@ -28,15 +28,15 @@ class TestEqueryInit(unittest.TestCase):
 			'u': 'uses',
 			'w': 'which'
 		}
-		self.failUnlessEqual(equery.NAME_MAP, name_map)
+		self.assertEqual(equery.NAME_MAP, name_map)
 		for short_name, long_name in zip(name_map, name_map.values()):
-			self.failUnlessEqual(equery.expand_module_name(short_name),
+			self.assertEqual(equery.expand_module_name(short_name),
 				long_name)
-			self.failUnlessEqual(equery.expand_module_name(long_name),
+			self.assertEqual(equery.expand_module_name(long_name),
 				long_name)
 		unused_keys = set(map(chr, range(0, 256))).difference(name_map.keys())
 		for key in unused_keys:
-			self.failUnlessRaises(KeyError, equery.expand_module_name, key)
+			self.assertRaises(KeyError, equery.expand_module_name, key)
 
 
 def test_main():
diff --git a/pym/gentoolkit/test/test_cpv.py b/pym/gentoolkit/test/test_cpv.py
index fe51a78..b34edfb 100644
--- a/pym/gentoolkit/test/test_cpv.py
+++ b/pym/gentoolkit/test/test_cpv.py
@@ -65,13 +65,13 @@ class TestGentoolkitCPV(unittest.TestCase):
 		]
 		# Check less than
 		for vt in version_tests:
-			self.failUnless(compare_strs(vt[0], vt[1]) == -1)
+			self.assertTrue(compare_strs(vt[0], vt[1]) == -1)
 		# Check greater than
 		for vt in version_tests:
-			self.failUnless(compare_strs(vt[1], vt[0]) == 1)
+			self.assertTrue(compare_strs(vt[1], vt[0]) == 1)
 		# Check equal
 		vt = ('sys-auth/pambase-20080318', 'sys-auth/pambase-20080318')
-		self.failUnless(compare_strs(vt[0], vt[1]) == 0)
+		self.assertTrue(compare_strs(vt[0], vt[1]) == 0)
 
 	def test_chunk_splitting(self):
 		all_tests = [
@@ -126,7 +126,7 @@ class TestGentoolkitCPV(unittest.TestCase):
 			cpv = CPV(test[0])
 			keys = ('category', 'name', 'cp', 'version', 'revision', 'fullversion')
 			for k in keys:
-				self.failUnlessEqual(
+				self.assertEqual(
 					getattr(cpv, k), test[1][k]
 				)
 
diff --git a/pym/gentoolkit/test/test_helpers.py b/pym/gentoolkit/test/test_helpers.py
index 81b9edf..734539c 100644
--- a/pym/gentoolkit/test/test_helpers.py
+++ b/pym/gentoolkit/test/test_helpers.py
@@ -73,7 +73,7 @@ class TestFileOwner(unittest.TestCase):
 			os.path.join(os.getcwd(), os.path.normpath(initial_file_list[3]))
 		]
 
-		self.failUnlessEqual(expand_abspaths(initial_file_list), final_file_list)
+		self.assertEqual(expand_abspaths(initial_file_list), final_file_list)
 
 	def test_extend_realpaths(self):
 		extend_realpaths = helpers.FileOwner.extend_realpaths
@@ -96,19 +96,19 @@ class TestFileOwner(unittest.TestCase):
 		p = [f1.name, f2.name, sym1, sym2]
 		p_xr = extend_realpaths(p)
 
-		self.failUnlessEqual(p_xr[0], f1.name)
-		self.failUnlessEqual(p_xr[1], f2.name)
-		self.failUnlessEqual(p_xr[2], sym1)
-		self.failUnlessEqual(p_xr[3], sym2)
-		self.failUnlessEqual(p_xr[4], f3.name)
+		self.assertEqual(p_xr[0], f1.name)
+		self.assertEqual(p_xr[1], f2.name)
+		self.assertEqual(p_xr[2], sym1)
+		self.assertEqual(p_xr[3], sym2)
+		self.assertEqual(p_xr[4], f3.name)
 
 		# Clean up
 		os.unlink(sym1)
 		os.unlink(sym2)
 
 		# Make sure we raise an exception if we don't get acceptable input
-		self.failUnlessRaises(AttributeError, extend_realpaths, 'str')
-		self.failUnlessRaises(AttributeError, extend_realpaths, set())
+		self.assertRaises(AttributeError, extend_realpaths, 'str')
+		self.assertRaises(AttributeError, extend_realpaths, set())
 
 
 def test_main():
diff --git a/pym/gentoolkit/test/test_keyword.py b/pym/gentoolkit/test/test_keyword.py
index 5d5236b..6a03859 100644
--- a/pym/gentoolkit/test/test_keyword.py
+++ b/pym/gentoolkit/test/test_keyword.py
@@ -21,13 +21,13 @@ class TestGentoolkitKeyword(unittest.TestCase):
 		]
 		# Check less than
 		for vt in version_tests:
-			self.failUnless(compare_strs(vt[0], vt[1]) == -1)
+			self.assertTrue(compare_strs(vt[0], vt[1]) == -1)
 		# Check greater than
 		for vt in version_tests:
-			self.failUnless(compare_strs(vt[1], vt[0]) == 1)
+			self.assertTrue(compare_strs(vt[1], vt[0]) == 1)
 		# Check equal
 		vt = ('~amd64-linux', '~amd64-linux')
-		self.failUnless(compare_strs(vt[0], vt[1]) == 0)
+		self.assertTrue(compare_strs(vt[0], vt[1]) == 0)
 
 		kwds_presort = [
 			'~amd64', '~amd64-linux', '~ppc', '~ppc-macos', '~x86',
@@ -38,8 +38,8 @@ class TestGentoolkitKeyword(unittest.TestCase):
 			'~ppc-macos', '~x86-macos', '~x86-solaris'
 		]
 		if sys.hexversion < 0x3000000:
-			self.failUnlessEqual(sorted(kwds_presort, cmp=compare_strs), kwds_postsort)
-		self.failUnlessEqual(sorted(kwds_presort, key = keyword.Keyword), kwds_postsort)
+			self.assertEqual(sorted(kwds_presort, cmp=compare_strs), kwds_postsort)
+		self.assertEqual(sorted(kwds_presort, key = keyword.Keyword), kwds_postsort)
 
 
 def test_main():
diff --git a/pym/gentoolkit/test/test_query.py b/pym/gentoolkit/test/test_query.py
index 24880de..8eb0159 100644
--- a/pym/gentoolkit/test/test_query.py
+++ b/pym/gentoolkit/test/test_query.py
@@ -20,7 +20,7 @@ class TestQuery(unittest.TestCase):
 			'/',
 		]
 		for q in invalid_queries:
-			self.failUnlessRaises(errors.GentoolkitInvalidPackage,
+			self.assertRaises(errors.GentoolkitInvalidPackage,
 				query.Query, q
 			)
 
@@ -32,7 +32,7 @@ class TestQuery(unittest.TestCase):
 			(q1.query_type, "simple")
 		]
 		for t in q1_tests:
-			self.failUnlessEqual(t[0], t[1])
+			self.assertEqual(t[0], t[1])
 
 		q2 = query.Query('gentoolkit-.*', is_regex=True)
 		q2_tests = [
@@ -42,7 +42,7 @@ class TestQuery(unittest.TestCase):
 			(q2.query_type, "complex")
 		]
 		for t in q2_tests:
-			self.failUnlessEqual(t[0], t[1])
+			self.assertEqual(t[0], t[1])
 
 		q3 = query.Query('*::gentoo')
 		q3_tests = [
@@ -52,7 +52,7 @@ class TestQuery(unittest.TestCase):
 			(q3.query_type, "complex")
 		]
 		for t in q3_tests:
-			self.failUnlessEqual(t[0], t[1])
+			self.assertEqual(t[0], t[1])
 
 		q4 = query.Query('gcc:4.3')
 		q4_tests = [
@@ -62,7 +62,7 @@ class TestQuery(unittest.TestCase):
 			(q4.query_type, "simple")
 		]
 		for t in q4_tests:
-			self.failUnlessEqual(t[0], t[1])
+			self.assertEqual(t[0], t[1])
 
 		q5 = query.Query('@system')
 		q5_tests = [
@@ -72,7 +72,7 @@ class TestQuery(unittest.TestCase):
 			(q5.query_type, "set")
 		]
 		for t in q5_tests:
-			self.failUnlessEqual(t[0], t[1])
+			self.assertEqual(t[0], t[1])
 
 	def test_uses_globbing(self):
 		globbing_tests = [
@@ -88,7 +88,7 @@ class TestQuery(unittest.TestCase):
 		]
 
 		for gt in globbing_tests:
-			self.failUnless(
+			self.assertTrue(
 				query.Query(gt[0]).uses_globbing() == gt[1]
 			)