Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH 3/6] tests: Append .py to files that need to be installed
Date: Thu, 21 Aug 2014 20:20:18
Message-Id: 1408652384-1954-4-git-send-email-mgorny@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCHES] setup.py install for Portage by "Michał Górny"
1 Append .py to the runTests script and __test__ files so that they could
2 be easily picked up by setup.py.
3 ---
4 .travis.yml | 2 +-
5 Makefile | 2 +-
6 pym/portage/tests/__init__.py | 4 +-
7 pym/portage/tests/bin/__test__ | 0
8 pym/portage/tests/bin/__test__.py | 0
9 pym/portage/tests/dbapi/__test__ | 0
10 pym/portage/tests/dbapi/__test__.py | 0
11 pym/portage/tests/dep/__test__ | 0
12 pym/portage/tests/dep/__test__.py | 0
13 pym/portage/tests/ebuild/__test__ | 0
14 pym/portage/tests/ebuild/__test__.py | 0
15 pym/portage/tests/emerge/__test__ | 0
16 pym/portage/tests/emerge/__test__.py | 0
17 pym/portage/tests/env/__test__ | 0
18 pym/portage/tests/env/__test__.py | 0
19 pym/portage/tests/env/config/__test__ | 0
20 pym/portage/tests/env/config/__test__.py | 0
21 pym/portage/tests/glsa/__test__ | 0
22 pym/portage/tests/glsa/__test__.py | 0
23 pym/portage/tests/lafilefixer/__test__ | 0
24 pym/portage/tests/lafilefixer/__test__.py | 0
25 pym/portage/tests/lazyimport/__test__ | 0
26 pym/portage/tests/lazyimport/__test__.py | 0
27 pym/portage/tests/lint/__test__ | 0
28 pym/portage/tests/lint/__test__.py | 0
29 pym/portage/tests/locks/__test__ | 0
30 pym/portage/tests/locks/__test__.py | 0
31 pym/portage/tests/news/__test__ | 0
32 pym/portage/tests/news/__test__.py | 0
33 pym/portage/tests/process/__test__ | 0
34 pym/portage/tests/process/__test__.py | 0
35 pym/portage/tests/repoman/__test__ | 0
36 pym/portage/tests/repoman/__test__.py | 0
37 pym/portage/tests/resolver/__test__ | 0
38 pym/portage/tests/resolver/__test__.py | 0
39 pym/portage/tests/runTests | 61 -------------------------------
40 pym/portage/tests/runTests.py | 61 +++++++++++++++++++++++++++++++
41 pym/portage/tests/sets/base/__test__ | 0
42 pym/portage/tests/sets/base/__test__.py | 0
43 pym/portage/tests/sets/files/__test__ | 0
44 pym/portage/tests/sets/files/__test__.py | 0
45 pym/portage/tests/sets/shell/__test__ | 0
46 pym/portage/tests/sets/shell/__test__.py | 0
47 pym/portage/tests/unicode/__test__ | 0
48 pym/portage/tests/unicode/__test__.py | 0
49 pym/portage/tests/update/__test__ | 0
50 pym/portage/tests/update/__test__.py | 0
51 pym/portage/tests/util/__test__ | 0
52 pym/portage/tests/util/__test__.py | 0
53 pym/portage/tests/versions/__test__ | 0
54 pym/portage/tests/versions/__test__.py | 0
55 pym/portage/tests/xpak/__test__ | 0
56 pym/portage/tests/xpak/__test__.py | 0
57 runtests.sh | 2 +-
58 54 files changed, 66 insertions(+), 66 deletions(-)
59 delete mode 100644 pym/portage/tests/bin/__test__
60 create mode 100644 pym/portage/tests/bin/__test__.py
61 delete mode 100644 pym/portage/tests/dbapi/__test__
62 create mode 100644 pym/portage/tests/dbapi/__test__.py
63 delete mode 100644 pym/portage/tests/dep/__test__
64 create mode 100644 pym/portage/tests/dep/__test__.py
65 delete mode 100644 pym/portage/tests/ebuild/__test__
66 create mode 100644 pym/portage/tests/ebuild/__test__.py
67 delete mode 100644 pym/portage/tests/emerge/__test__
68 create mode 100644 pym/portage/tests/emerge/__test__.py
69 delete mode 100644 pym/portage/tests/env/__test__
70 create mode 100644 pym/portage/tests/env/__test__.py
71 delete mode 100644 pym/portage/tests/env/config/__test__
72 create mode 100644 pym/portage/tests/env/config/__test__.py
73 delete mode 100644 pym/portage/tests/glsa/__test__
74 create mode 100644 pym/portage/tests/glsa/__test__.py
75 delete mode 100644 pym/portage/tests/lafilefixer/__test__
76 create mode 100644 pym/portage/tests/lafilefixer/__test__.py
77 delete mode 100644 pym/portage/tests/lazyimport/__test__
78 create mode 100644 pym/portage/tests/lazyimport/__test__.py
79 delete mode 100644 pym/portage/tests/lint/__test__
80 create mode 100644 pym/portage/tests/lint/__test__.py
81 delete mode 100644 pym/portage/tests/locks/__test__
82 create mode 100644 pym/portage/tests/locks/__test__.py
83 delete mode 100644 pym/portage/tests/news/__test__
84 create mode 100644 pym/portage/tests/news/__test__.py
85 delete mode 100644 pym/portage/tests/process/__test__
86 create mode 100644 pym/portage/tests/process/__test__.py
87 delete mode 100644 pym/portage/tests/repoman/__test__
88 create mode 100644 pym/portage/tests/repoman/__test__.py
89 delete mode 100644 pym/portage/tests/resolver/__test__
90 create mode 100644 pym/portage/tests/resolver/__test__.py
91 delete mode 100755 pym/portage/tests/runTests
92 create mode 100755 pym/portage/tests/runTests.py
93 delete mode 100644 pym/portage/tests/sets/base/__test__
94 create mode 100644 pym/portage/tests/sets/base/__test__.py
95 delete mode 100644 pym/portage/tests/sets/files/__test__
96 create mode 100644 pym/portage/tests/sets/files/__test__.py
97 delete mode 100644 pym/portage/tests/sets/shell/__test__
98 create mode 100644 pym/portage/tests/sets/shell/__test__.py
99 delete mode 100644 pym/portage/tests/unicode/__test__
100 create mode 100644 pym/portage/tests/unicode/__test__.py
101 delete mode 100644 pym/portage/tests/update/__test__
102 create mode 100644 pym/portage/tests/update/__test__.py
103 delete mode 100644 pym/portage/tests/util/__test__
104 create mode 100644 pym/portage/tests/util/__test__.py
105 delete mode 100644 pym/portage/tests/versions/__test__
106 create mode 100644 pym/portage/tests/versions/__test__.py
107 delete mode 100644 pym/portage/tests/xpak/__test__
108 create mode 100644 pym/portage/tests/xpak/__test__.py
109
110 diff --git a/.travis.yml b/.travis.yml
111 index 6c8d873..52ca444 100644
112 --- a/.travis.yml
113 +++ b/.travis.yml
114 @@ -7,4 +7,4 @@ python:
115 - 3.4
116 - pypy
117 script:
118 - - python -b -Wd pym/portage/tests/runTests
119 + - python -b -Wd pym/portage/tests/runTests.py
120 diff --git a/Makefile b/Makefile
121 index 92ea195..9eb6e66 100644
122 --- a/Makefile
123 +++ b/Makefile
124 @@ -66,7 +66,7 @@ epydoc:
125
126 test:
127 set -e; \
128 - "$(srcdir)/pym/portage/tests/runTests"; \
129 + "$(srcdir)/pym/portage/tests/runTests.py"; \
130
131 install:
132 set -e; \
133 diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py
134 index 84e732a..697b800 100644
135 --- a/pym/portage/tests/__init__.py
136 +++ b/pym/portage/tests/__init__.py
137 @@ -83,11 +83,11 @@ def getTestFromCommandLine(args, base_path):
138 return result
139
140 def getTestDirs(base_path):
141 - TEST_FILE = b'__test__'
142 + TEST_FILE = b'__test__.py'
143 testDirs = []
144
145 # the os.walk help mentions relative paths as being quirky
146 - # I was tired of adding dirs to the list, so now we add __test__
147 + # I was tired of adding dirs to the list, so now we add __test__.py
148 # to each dir we want tested.
149 for root, dirs, files in os.walk(base_path):
150 try:
151 diff --git a/pym/portage/tests/bin/__test__ b/pym/portage/tests/bin/__test__
152 deleted file mode 100644
153 index e69de29..0000000
154 diff --git a/pym/portage/tests/bin/__test__.py b/pym/portage/tests/bin/__test__.py
155 new file mode 100644
156 index 0000000..e69de29
157 diff --git a/pym/portage/tests/dbapi/__test__ b/pym/portage/tests/dbapi/__test__
158 deleted file mode 100644
159 index e69de29..0000000
160 diff --git a/pym/portage/tests/dbapi/__test__.py b/pym/portage/tests/dbapi/__test__.py
161 new file mode 100644
162 index 0000000..e69de29
163 diff --git a/pym/portage/tests/dep/__test__ b/pym/portage/tests/dep/__test__
164 deleted file mode 100644
165 index e69de29..0000000
166 diff --git a/pym/portage/tests/dep/__test__.py b/pym/portage/tests/dep/__test__.py
167 new file mode 100644
168 index 0000000..e69de29
169 diff --git a/pym/portage/tests/ebuild/__test__ b/pym/portage/tests/ebuild/__test__
170 deleted file mode 100644
171 index e69de29..0000000
172 diff --git a/pym/portage/tests/ebuild/__test__.py b/pym/portage/tests/ebuild/__test__.py
173 new file mode 100644
174 index 0000000..e69de29
175 diff --git a/pym/portage/tests/emerge/__test__ b/pym/portage/tests/emerge/__test__
176 deleted file mode 100644
177 index e69de29..0000000
178 diff --git a/pym/portage/tests/emerge/__test__.py b/pym/portage/tests/emerge/__test__.py
179 new file mode 100644
180 index 0000000..e69de29
181 diff --git a/pym/portage/tests/env/__test__ b/pym/portage/tests/env/__test__
182 deleted file mode 100644
183 index e69de29..0000000
184 diff --git a/pym/portage/tests/env/__test__.py b/pym/portage/tests/env/__test__.py
185 new file mode 100644
186 index 0000000..e69de29
187 diff --git a/pym/portage/tests/env/config/__test__ b/pym/portage/tests/env/config/__test__
188 deleted file mode 100644
189 index e69de29..0000000
190 diff --git a/pym/portage/tests/env/config/__test__.py b/pym/portage/tests/env/config/__test__.py
191 new file mode 100644
192 index 0000000..e69de29
193 diff --git a/pym/portage/tests/glsa/__test__ b/pym/portage/tests/glsa/__test__
194 deleted file mode 100644
195 index e69de29..0000000
196 diff --git a/pym/portage/tests/glsa/__test__.py b/pym/portage/tests/glsa/__test__.py
197 new file mode 100644
198 index 0000000..e69de29
199 diff --git a/pym/portage/tests/lafilefixer/__test__ b/pym/portage/tests/lafilefixer/__test__
200 deleted file mode 100644
201 index e69de29..0000000
202 diff --git a/pym/portage/tests/lafilefixer/__test__.py b/pym/portage/tests/lafilefixer/__test__.py
203 new file mode 100644
204 index 0000000..e69de29
205 diff --git a/pym/portage/tests/lazyimport/__test__ b/pym/portage/tests/lazyimport/__test__
206 deleted file mode 100644
207 index e69de29..0000000
208 diff --git a/pym/portage/tests/lazyimport/__test__.py b/pym/portage/tests/lazyimport/__test__.py
209 new file mode 100644
210 index 0000000..e69de29
211 diff --git a/pym/portage/tests/lint/__test__ b/pym/portage/tests/lint/__test__
212 deleted file mode 100644
213 index e69de29..0000000
214 diff --git a/pym/portage/tests/lint/__test__.py b/pym/portage/tests/lint/__test__.py
215 new file mode 100644
216 index 0000000..e69de29
217 diff --git a/pym/portage/tests/locks/__test__ b/pym/portage/tests/locks/__test__
218 deleted file mode 100644
219 index e69de29..0000000
220 diff --git a/pym/portage/tests/locks/__test__.py b/pym/portage/tests/locks/__test__.py
221 new file mode 100644
222 index 0000000..e69de29
223 diff --git a/pym/portage/tests/news/__test__ b/pym/portage/tests/news/__test__
224 deleted file mode 100644
225 index e69de29..0000000
226 diff --git a/pym/portage/tests/news/__test__.py b/pym/portage/tests/news/__test__.py
227 new file mode 100644
228 index 0000000..e69de29
229 diff --git a/pym/portage/tests/process/__test__ b/pym/portage/tests/process/__test__
230 deleted file mode 100644
231 index e69de29..0000000
232 diff --git a/pym/portage/tests/process/__test__.py b/pym/portage/tests/process/__test__.py
233 new file mode 100644
234 index 0000000..e69de29
235 diff --git a/pym/portage/tests/repoman/__test__ b/pym/portage/tests/repoman/__test__
236 deleted file mode 100644
237 index e69de29..0000000
238 diff --git a/pym/portage/tests/repoman/__test__.py b/pym/portage/tests/repoman/__test__.py
239 new file mode 100644
240 index 0000000..e69de29
241 diff --git a/pym/portage/tests/resolver/__test__ b/pym/portage/tests/resolver/__test__
242 deleted file mode 100644
243 index e69de29..0000000
244 diff --git a/pym/portage/tests/resolver/__test__.py b/pym/portage/tests/resolver/__test__.py
245 new file mode 100644
246 index 0000000..e69de29
247 diff --git a/pym/portage/tests/runTests b/pym/portage/tests/runTests
248 deleted file mode 100755
249 index 9c45276..0000000
250 --- a/pym/portage/tests/runTests
251 +++ /dev/null
252 @@ -1,61 +0,0 @@
253 -#!/usr/bin/python -bWd
254 -# runTests.py -- Portage Unit Test Functionality
255 -# Copyright 2006-2014 Gentoo Foundation
256 -# Distributed under the terms of the GNU General Public License v2
257 -
258 -import os, sys
259 -import os.path as osp
260 -import grp
261 -import platform
262 -import pwd
263 -import signal
264 -
265 -def debug_signal(signum, frame):
266 - import pdb
267 - pdb.set_trace()
268 -
269 -if platform.python_implementation() == 'Jython':
270 - debug_signum = signal.SIGUSR2 # bug #424259
271 -else:
272 - debug_signum = signal.SIGUSR1
273 -
274 -signal.signal(debug_signum, debug_signal)
275 -
276 -# Pretend that the current user's uid/gid are the 'portage' uid/gid,
277 -# so things go smoothly regardless of the current user and global
278 -# user/group configuration.
279 -os.environ["PORTAGE_USERNAME"] = pwd.getpwuid(os.getuid()).pw_name
280 -os.environ["PORTAGE_GRPNAME"] = grp.getgrgid(os.getgid()).gr_name
281 -
282 -# Insert our parent dir so we can do shiny import "tests"
283 -# This line courtesy of Marienz and Pkgcore ;)
284 -sys.path.insert(0, osp.dirname(osp.dirname(osp.dirname(osp.realpath(__file__)))))
285 -
286 -import portage
287 -portage._internal_caller = True
288 -
289 -# Ensure that we don't instantiate portage.settings, so that tests should
290 -# work the same regardless of global configuration file state/existence.
291 -portage._disable_legacy_globals()
292 -
293 -if os.environ.get('NOCOLOR') in ('yes', 'true'):
294 - portage.output.nocolor()
295 -
296 -import portage.tests as tests
297 -from portage.const import PORTAGE_BIN_PATH
298 -path = os.environ.get("PATH", "").split(":")
299 -path = [x for x in path if x]
300 -
301 -insert_bin_path = True
302 -try:
303 - insert_bin_path = not path or \
304 - not os.path.samefile(path[0], PORTAGE_BIN_PATH)
305 -except OSError:
306 - pass
307 -
308 -if insert_bin_path:
309 - path.insert(0, PORTAGE_BIN_PATH)
310 - os.environ["PATH"] = ":".join(path)
311 -
312 -if __name__ == "__main__":
313 - sys.exit(tests.main())
314 diff --git a/pym/portage/tests/runTests.py b/pym/portage/tests/runTests.py
315 new file mode 100755
316 index 0000000..9c45276
317 --- /dev/null
318 +++ b/pym/portage/tests/runTests.py
319 @@ -0,0 +1,61 @@
320 +#!/usr/bin/python -bWd
321 +# runTests.py -- Portage Unit Test Functionality
322 +# Copyright 2006-2014 Gentoo Foundation
323 +# Distributed under the terms of the GNU General Public License v2
324 +
325 +import os, sys
326 +import os.path as osp
327 +import grp
328 +import platform
329 +import pwd
330 +import signal
331 +
332 +def debug_signal(signum, frame):
333 + import pdb
334 + pdb.set_trace()
335 +
336 +if platform.python_implementation() == 'Jython':
337 + debug_signum = signal.SIGUSR2 # bug #424259
338 +else:
339 + debug_signum = signal.SIGUSR1
340 +
341 +signal.signal(debug_signum, debug_signal)
342 +
343 +# Pretend that the current user's uid/gid are the 'portage' uid/gid,
344 +# so things go smoothly regardless of the current user and global
345 +# user/group configuration.
346 +os.environ["PORTAGE_USERNAME"] = pwd.getpwuid(os.getuid()).pw_name
347 +os.environ["PORTAGE_GRPNAME"] = grp.getgrgid(os.getgid()).gr_name
348 +
349 +# Insert our parent dir so we can do shiny import "tests"
350 +# This line courtesy of Marienz and Pkgcore ;)
351 +sys.path.insert(0, osp.dirname(osp.dirname(osp.dirname(osp.realpath(__file__)))))
352 +
353 +import portage
354 +portage._internal_caller = True
355 +
356 +# Ensure that we don't instantiate portage.settings, so that tests should
357 +# work the same regardless of global configuration file state/existence.
358 +portage._disable_legacy_globals()
359 +
360 +if os.environ.get('NOCOLOR') in ('yes', 'true'):
361 + portage.output.nocolor()
362 +
363 +import portage.tests as tests
364 +from portage.const import PORTAGE_BIN_PATH
365 +path = os.environ.get("PATH", "").split(":")
366 +path = [x for x in path if x]
367 +
368 +insert_bin_path = True
369 +try:
370 + insert_bin_path = not path or \
371 + not os.path.samefile(path[0], PORTAGE_BIN_PATH)
372 +except OSError:
373 + pass
374 +
375 +if insert_bin_path:
376 + path.insert(0, PORTAGE_BIN_PATH)
377 + os.environ["PATH"] = ":".join(path)
378 +
379 +if __name__ == "__main__":
380 + sys.exit(tests.main())
381 diff --git a/pym/portage/tests/sets/base/__test__ b/pym/portage/tests/sets/base/__test__
382 deleted file mode 100644
383 index e69de29..0000000
384 diff --git a/pym/portage/tests/sets/base/__test__.py b/pym/portage/tests/sets/base/__test__.py
385 new file mode 100644
386 index 0000000..e69de29
387 diff --git a/pym/portage/tests/sets/files/__test__ b/pym/portage/tests/sets/files/__test__
388 deleted file mode 100644
389 index e69de29..0000000
390 diff --git a/pym/portage/tests/sets/files/__test__.py b/pym/portage/tests/sets/files/__test__.py
391 new file mode 100644
392 index 0000000..e69de29
393 diff --git a/pym/portage/tests/sets/shell/__test__ b/pym/portage/tests/sets/shell/__test__
394 deleted file mode 100644
395 index e69de29..0000000
396 diff --git a/pym/portage/tests/sets/shell/__test__.py b/pym/portage/tests/sets/shell/__test__.py
397 new file mode 100644
398 index 0000000..e69de29
399 diff --git a/pym/portage/tests/unicode/__test__ b/pym/portage/tests/unicode/__test__
400 deleted file mode 100644
401 index e69de29..0000000
402 diff --git a/pym/portage/tests/unicode/__test__.py b/pym/portage/tests/unicode/__test__.py
403 new file mode 100644
404 index 0000000..e69de29
405 diff --git a/pym/portage/tests/update/__test__ b/pym/portage/tests/update/__test__
406 deleted file mode 100644
407 index e69de29..0000000
408 diff --git a/pym/portage/tests/update/__test__.py b/pym/portage/tests/update/__test__.py
409 new file mode 100644
410 index 0000000..e69de29
411 diff --git a/pym/portage/tests/util/__test__ b/pym/portage/tests/util/__test__
412 deleted file mode 100644
413 index e69de29..0000000
414 diff --git a/pym/portage/tests/util/__test__.py b/pym/portage/tests/util/__test__.py
415 new file mode 100644
416 index 0000000..e69de29
417 diff --git a/pym/portage/tests/versions/__test__ b/pym/portage/tests/versions/__test__
418 deleted file mode 100644
419 index e69de29..0000000
420 diff --git a/pym/portage/tests/versions/__test__.py b/pym/portage/tests/versions/__test__.py
421 new file mode 100644
422 index 0000000..e69de29
423 diff --git a/pym/portage/tests/xpak/__test__ b/pym/portage/tests/xpak/__test__
424 deleted file mode 100644
425 index e69de29..0000000
426 diff --git a/pym/portage/tests/xpak/__test__.py b/pym/portage/tests/xpak/__test__.py
427 new file mode 100644
428 index 0000000..e69de29
429 diff --git a/runtests.sh b/runtests.sh
430 index 7999220..599727b 100755
431 --- a/runtests.sh
432 +++ b/runtests.sh
433 @@ -67,7 +67,7 @@ for version in ${PYTHON_VERSIONS}; do
434 fi
435 if [[ -x "${executable}" ]]; then
436 echo -e "${GOOD}Testing with Python ${version}...${NORMAL}"
437 - "${executable}" -b -Wd pym/portage/tests/runTests "$@"
438 + "${executable}" -b -Wd pym/portage/tests/runTests.py "$@"
439 status=$?
440 status_array[${#status_array[@]}]=${status}
441 found_versions[${#found_versions[@]}]=${version}
442 --
443 2.0.4