1 |
commit: cd4584ed5934381ff967f4a031b31b8c2e55b530 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 26 15:15:02 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 26 15:15:02 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=cd4584ed |
7 |
|
8 |
Modernize test assertions |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
pym/gentoolkit/cpv.py | 4 ++-- |
13 |
pym/gentoolkit/revdep_rebuild/settings.py | 6 +++--- |
14 |
pym/gentoolkit/test/eclean/test_search.py | 10 +++++----- |
15 |
pym/gentoolkit/test/equery/test_init.py | 8 ++++---- |
16 |
pym/gentoolkit/test/test_cpv.py | 8 ++++---- |
17 |
pym/gentoolkit/test/test_helpers.py | 16 ++++++++-------- |
18 |
pym/gentoolkit/test/test_keyword.py | 10 +++++----- |
19 |
pym/gentoolkit/test/test_query.py | 14 +++++++------- |
20 |
8 files changed, 38 insertions(+), 38 deletions(-) |
21 |
|
22 |
diff --git a/pym/gentoolkit/cpv.py b/pym/gentoolkit/cpv.py |
23 |
index 169c833..2e8e167 100644 |
24 |
--- a/pym/gentoolkit/cpv.py |
25 |
+++ b/pym/gentoolkit/cpv.py |
26 |
@@ -28,8 +28,8 @@ from gentoolkit import errors |
27 |
# Globals |
28 |
# ======= |
29 |
|
30 |
-isvalid_version_re = re.compile(r"^(?:cvs\\.)?(?:\\d+)(?:\\.\\d+)*[a-z]?" |
31 |
- r"(?:_(p(?:re)?|beta|alpha|rc)\\d*)*$") |
32 |
+isvalid_version_re = re.compile(r"^(?:cvs\.)?(?:\d+)(?:\.\d+)*[a-z]?" |
33 |
+ r"(?:_(p(?:re)?|beta|alpha|rc)\d*)*$") |
34 |
isvalid_cat_re = re.compile(r"^(?:[a-zA-Z0-9][-a-zA-Z0-9+._]*(?:/(?!$))?)+$") |
35 |
_pkg_re = re.compile(r"^[a-zA-Z0-9+._]+$") |
36 |
# Prefix specific revision is of the form -r0<digit>+.<digit>+ |
37 |
|
38 |
diff --git a/pym/gentoolkit/revdep_rebuild/settings.py b/pym/gentoolkit/revdep_rebuild/settings.py |
39 |
index ca8d5fa..718fee7 100644 |
40 |
--- a/pym/gentoolkit/revdep_rebuild/settings.py |
41 |
+++ b/pym/gentoolkit/revdep_rebuild/settings.py |
42 |
@@ -151,15 +151,15 @@ def parse_revdep_config(revdep_confdir): |
43 |
line = line.strip() |
44 |
#first check for comment, we do not want to regex all lines |
45 |
if not line.startswith('#'): |
46 |
- match = re.match(r'LD_LIBRARY_MASK=\\"([^"]+)\\"', line) |
47 |
+ match = re.match(r'LD_LIBRARY_MASK=\"([^"]+)"', line) |
48 |
if match is not None: |
49 |
masked_files += ' ' + match.group(1) |
50 |
continue |
51 |
- match = re.match(r'SEARCH_DIRS_MASK=\\"([^"]+)\\"', line) |
52 |
+ match = re.match(r'SEARCH_DIRS_MASK=\"([^"]+)"', line) |
53 |
if match is not None: |
54 |
masked_dirs += ' ' + match.group(1) |
55 |
continue |
56 |
- match = re.match(r'SEARCH_DIRS=\\"([^"]+)\\"', line) |
57 |
+ match = re.match(r'SEARCH_DIRS="([^"]+)"', line) |
58 |
if match is not None: |
59 |
search_dirs += ' ' + match.group(1) |
60 |
continue |
61 |
|
62 |
diff --git a/pym/gentoolkit/test/eclean/test_search.py b/pym/gentoolkit/test/eclean/test_search.py |
63 |
index 4533909..6dc26a2 100755 |
64 |
--- a/pym/gentoolkit/test/eclean/test_search.py |
65 |
+++ b/pym/gentoolkit/test/eclean/test_search.py |
66 |
@@ -166,12 +166,12 @@ class TestCheckLimits(unittest.TestCase): |
67 |
test['results'].sort() |
68 |
#print("actual=", run_results[i]) |
69 |
#print("should-be=", test['results']) |
70 |
- self.failUnlessEqual(run_results[i], test["results"], |
71 |
+ self.assertEqual(run_results[i], test["results"], |
72 |
"/ntest_check_limits, test# %d, test=%s, diff=%s" |
73 |
%(i, test['test'], str(set(run_results[i]).difference(test['results']))) |
74 |
) |
75 |
test['output'].sort() |
76 |
- self.failUnlessEqual(run_callbacks[i], test['output']) |
77 |
+ self.assertEqual(run_callbacks[i], test['output']) |
78 |
|
79 |
|
80 |
class TestFetchRestricted(unittest.TestCase): |
81 |
@@ -290,7 +290,7 @@ class TestFetchRestricted(unittest.TestCase): |
82 |
else: |
83 |
test = "FAILED" |
84 |
print("comparing %s, %s" %(key, item), test) |
85 |
- self.failUnlessEqual(sorted(testdata[item]), sorted(results[item]), |
86 |
+ self.assertEqual(sorted(testdata[item]), sorted(results[item]), |
87 |
"\n%s: %s %s data does not match\nresult=" %(test_name, key, item) +\ |
88 |
str(results[item]) + "\ntestdata=" + str(testdata[item])) |
89 |
|
90 |
@@ -530,7 +530,7 @@ class TestNonDestructive(unittest.TestCase): |
91 |
print("comparing %s, %s..." %(key, item), test) |
92 |
if test == "FAILED": |
93 |
print("", sorted(results[item]), "\n", sorted(testdata[item])) |
94 |
- self.failUnlessEqual(sorted(testdata[item]), sorted(results[item]), |
95 |
+ self.assertEqual(sorted(testdata[item]), sorted(results[item]), |
96 |
"\n%s: %s, %s data does not match\n" |
97 |
%(test_name, key, item) + \ |
98 |
"result=" + str(results[item]) + "\ntestdata=" + str(testdata[item]) |
99 |
@@ -609,7 +609,7 @@ class TestRemoveProtected(unittest.TestCase): |
100 |
|
101 |
def test_remove_protected(self): |
102 |
results = self.target_class._remove_protected(PKGS, CLEAN_ME) |
103 |
- self.failUnlessEqual(results, self.results, |
104 |
+ self.assertEqual(results, self.results, |
105 |
"\ntest_remove_protected: data does not match\nresult=" +\ |
106 |
str(results) + "\ntestdata=" + str(self.results)) |
107 |
|
108 |
|
109 |
diff --git a/pym/gentoolkit/test/equery/test_init.py b/pym/gentoolkit/test/equery/test_init.py |
110 |
index 22db564..075f653 100644 |
111 |
--- a/pym/gentoolkit/test/equery/test_init.py |
112 |
+++ b/pym/gentoolkit/test/equery/test_init.py |
113 |
@@ -28,15 +28,15 @@ class TestEqueryInit(unittest.TestCase): |
114 |
'u': 'uses', |
115 |
'w': 'which' |
116 |
} |
117 |
- self.failUnlessEqual(equery.NAME_MAP, name_map) |
118 |
+ self.assertEqual(equery.NAME_MAP, name_map) |
119 |
for short_name, long_name in zip(name_map, name_map.values()): |
120 |
- self.failUnlessEqual(equery.expand_module_name(short_name), |
121 |
+ self.assertEqual(equery.expand_module_name(short_name), |
122 |
long_name) |
123 |
- self.failUnlessEqual(equery.expand_module_name(long_name), |
124 |
+ self.assertEqual(equery.expand_module_name(long_name), |
125 |
long_name) |
126 |
unused_keys = set(map(chr, range(0, 256))).difference(name_map.keys()) |
127 |
for key in unused_keys: |
128 |
- self.failUnlessRaises(KeyError, equery.expand_module_name, key) |
129 |
+ self.assertRaises(KeyError, equery.expand_module_name, key) |
130 |
|
131 |
|
132 |
def test_main(): |
133 |
|
134 |
diff --git a/pym/gentoolkit/test/test_cpv.py b/pym/gentoolkit/test/test_cpv.py |
135 |
index fe51a78..b34edfb 100644 |
136 |
--- a/pym/gentoolkit/test/test_cpv.py |
137 |
+++ b/pym/gentoolkit/test/test_cpv.py |
138 |
@@ -65,13 +65,13 @@ class TestGentoolkitCPV(unittest.TestCase): |
139 |
] |
140 |
# Check less than |
141 |
for vt in version_tests: |
142 |
- self.failUnless(compare_strs(vt[0], vt[1]) == -1) |
143 |
+ self.assertTrue(compare_strs(vt[0], vt[1]) == -1) |
144 |
# Check greater than |
145 |
for vt in version_tests: |
146 |
- self.failUnless(compare_strs(vt[1], vt[0]) == 1) |
147 |
+ self.assertTrue(compare_strs(vt[1], vt[0]) == 1) |
148 |
# Check equal |
149 |
vt = ('sys-auth/pambase-20080318', 'sys-auth/pambase-20080318') |
150 |
- self.failUnless(compare_strs(vt[0], vt[1]) == 0) |
151 |
+ self.assertTrue(compare_strs(vt[0], vt[1]) == 0) |
152 |
|
153 |
def test_chunk_splitting(self): |
154 |
all_tests = [ |
155 |
@@ -126,7 +126,7 @@ class TestGentoolkitCPV(unittest.TestCase): |
156 |
cpv = CPV(test[0]) |
157 |
keys = ('category', 'name', 'cp', 'version', 'revision', 'fullversion') |
158 |
for k in keys: |
159 |
- self.failUnlessEqual( |
160 |
+ self.assertEqual( |
161 |
getattr(cpv, k), test[1][k] |
162 |
) |
163 |
|
164 |
|
165 |
diff --git a/pym/gentoolkit/test/test_helpers.py b/pym/gentoolkit/test/test_helpers.py |
166 |
index 81b9edf..734539c 100644 |
167 |
--- a/pym/gentoolkit/test/test_helpers.py |
168 |
+++ b/pym/gentoolkit/test/test_helpers.py |
169 |
@@ -73,7 +73,7 @@ class TestFileOwner(unittest.TestCase): |
170 |
os.path.join(os.getcwd(), os.path.normpath(initial_file_list[3])) |
171 |
] |
172 |
|
173 |
- self.failUnlessEqual(expand_abspaths(initial_file_list), final_file_list) |
174 |
+ self.assertEqual(expand_abspaths(initial_file_list), final_file_list) |
175 |
|
176 |
def test_extend_realpaths(self): |
177 |
extend_realpaths = helpers.FileOwner.extend_realpaths |
178 |
@@ -96,19 +96,19 @@ class TestFileOwner(unittest.TestCase): |
179 |
p = [f1.name, f2.name, sym1, sym2] |
180 |
p_xr = extend_realpaths(p) |
181 |
|
182 |
- self.failUnlessEqual(p_xr[0], f1.name) |
183 |
- self.failUnlessEqual(p_xr[1], f2.name) |
184 |
- self.failUnlessEqual(p_xr[2], sym1) |
185 |
- self.failUnlessEqual(p_xr[3], sym2) |
186 |
- self.failUnlessEqual(p_xr[4], f3.name) |
187 |
+ self.assertEqual(p_xr[0], f1.name) |
188 |
+ self.assertEqual(p_xr[1], f2.name) |
189 |
+ self.assertEqual(p_xr[2], sym1) |
190 |
+ self.assertEqual(p_xr[3], sym2) |
191 |
+ self.assertEqual(p_xr[4], f3.name) |
192 |
|
193 |
# Clean up |
194 |
os.unlink(sym1) |
195 |
os.unlink(sym2) |
196 |
|
197 |
# Make sure we raise an exception if we don't get acceptable input |
198 |
- self.failUnlessRaises(AttributeError, extend_realpaths, 'str') |
199 |
- self.failUnlessRaises(AttributeError, extend_realpaths, set()) |
200 |
+ self.assertRaises(AttributeError, extend_realpaths, 'str') |
201 |
+ self.assertRaises(AttributeError, extend_realpaths, set()) |
202 |
|
203 |
|
204 |
def test_main(): |
205 |
|
206 |
diff --git a/pym/gentoolkit/test/test_keyword.py b/pym/gentoolkit/test/test_keyword.py |
207 |
index 5d5236b..6a03859 100644 |
208 |
--- a/pym/gentoolkit/test/test_keyword.py |
209 |
+++ b/pym/gentoolkit/test/test_keyword.py |
210 |
@@ -21,13 +21,13 @@ class TestGentoolkitKeyword(unittest.TestCase): |
211 |
] |
212 |
# Check less than |
213 |
for vt in version_tests: |
214 |
- self.failUnless(compare_strs(vt[0], vt[1]) == -1) |
215 |
+ self.assertTrue(compare_strs(vt[0], vt[1]) == -1) |
216 |
# Check greater than |
217 |
for vt in version_tests: |
218 |
- self.failUnless(compare_strs(vt[1], vt[0]) == 1) |
219 |
+ self.assertTrue(compare_strs(vt[1], vt[0]) == 1) |
220 |
# Check equal |
221 |
vt = ('~amd64-linux', '~amd64-linux') |
222 |
- self.failUnless(compare_strs(vt[0], vt[1]) == 0) |
223 |
+ self.assertTrue(compare_strs(vt[0], vt[1]) == 0) |
224 |
|
225 |
kwds_presort = [ |
226 |
'~amd64', '~amd64-linux', '~ppc', '~ppc-macos', '~x86', |
227 |
@@ -38,8 +38,8 @@ class TestGentoolkitKeyword(unittest.TestCase): |
228 |
'~ppc-macos', '~x86-macos', '~x86-solaris' |
229 |
] |
230 |
if sys.hexversion < 0x3000000: |
231 |
- self.failUnlessEqual(sorted(kwds_presort, cmp=compare_strs), kwds_postsort) |
232 |
- self.failUnlessEqual(sorted(kwds_presort, key = keyword.Keyword), kwds_postsort) |
233 |
+ self.assertEqual(sorted(kwds_presort, cmp=compare_strs), kwds_postsort) |
234 |
+ self.assertEqual(sorted(kwds_presort, key = keyword.Keyword), kwds_postsort) |
235 |
|
236 |
|
237 |
def test_main(): |
238 |
|
239 |
diff --git a/pym/gentoolkit/test/test_query.py b/pym/gentoolkit/test/test_query.py |
240 |
index 24880de..8eb0159 100644 |
241 |
--- a/pym/gentoolkit/test/test_query.py |
242 |
+++ b/pym/gentoolkit/test/test_query.py |
243 |
@@ -20,7 +20,7 @@ class TestQuery(unittest.TestCase): |
244 |
'/', |
245 |
] |
246 |
for q in invalid_queries: |
247 |
- self.failUnlessRaises(errors.GentoolkitInvalidPackage, |
248 |
+ self.assertRaises(errors.GentoolkitInvalidPackage, |
249 |
query.Query, q |
250 |
) |
251 |
|
252 |
@@ -32,7 +32,7 @@ class TestQuery(unittest.TestCase): |
253 |
(q1.query_type, "simple") |
254 |
] |
255 |
for t in q1_tests: |
256 |
- self.failUnlessEqual(t[0], t[1]) |
257 |
+ self.assertEqual(t[0], t[1]) |
258 |
|
259 |
q2 = query.Query('gentoolkit-.*', is_regex=True) |
260 |
q2_tests = [ |
261 |
@@ -42,7 +42,7 @@ class TestQuery(unittest.TestCase): |
262 |
(q2.query_type, "complex") |
263 |
] |
264 |
for t in q2_tests: |
265 |
- self.failUnlessEqual(t[0], t[1]) |
266 |
+ self.assertEqual(t[0], t[1]) |
267 |
|
268 |
q3 = query.Query('*::gentoo') |
269 |
q3_tests = [ |
270 |
@@ -52,7 +52,7 @@ class TestQuery(unittest.TestCase): |
271 |
(q3.query_type, "complex") |
272 |
] |
273 |
for t in q3_tests: |
274 |
- self.failUnlessEqual(t[0], t[1]) |
275 |
+ self.assertEqual(t[0], t[1]) |
276 |
|
277 |
q4 = query.Query('gcc:4.3') |
278 |
q4_tests = [ |
279 |
@@ -62,7 +62,7 @@ class TestQuery(unittest.TestCase): |
280 |
(q4.query_type, "simple") |
281 |
] |
282 |
for t in q4_tests: |
283 |
- self.failUnlessEqual(t[0], t[1]) |
284 |
+ self.assertEqual(t[0], t[1]) |
285 |
|
286 |
q5 = query.Query('@system') |
287 |
q5_tests = [ |
288 |
@@ -72,7 +72,7 @@ class TestQuery(unittest.TestCase): |
289 |
(q5.query_type, "set") |
290 |
] |
291 |
for t in q5_tests: |
292 |
- self.failUnlessEqual(t[0], t[1]) |
293 |
+ self.assertEqual(t[0], t[1]) |
294 |
|
295 |
def test_uses_globbing(self): |
296 |
globbing_tests = [ |
297 |
@@ -88,7 +88,7 @@ class TestQuery(unittest.TestCase): |
298 |
] |
299 |
|
300 |
for gt in globbing_tests: |
301 |
- self.failUnless( |
302 |
+ self.assertTrue( |
303 |
query.Query(gt[0]).uses_globbing() == gt[1] |
304 |
) |