commit: 9fd70e67f3bc1ddae84b6097c5b651cce713b91a Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Aug 9 07:54:37 2014 +0000 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> CommitDate: Thu Sep 11 23:44:25 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9fd70e67
tests: Append .py to files that need to be installed Append .py to the runTests script and __test__ files so that they could be easily picked up by setup.py. --- .travis.yml | 2 +- Makefile | 2 +- pym/portage/tests/__init__.py | 4 ++-- pym/portage/tests/bin/{__test__ => __test__.py} | 0 pym/portage/tests/dbapi/{__test__ => __test__.py} | 0 pym/portage/tests/dep/{__test__ => __test__.py} | 0 pym/portage/tests/ebuild/{__test__ => __test__.py} | 0 pym/portage/tests/emerge/{__test__ => __test__.py} | 0 pym/portage/tests/env/{__test__ => __test__.py} | 0 pym/portage/tests/env/config/{__test__ => __test__.py} | 0 pym/portage/tests/glsa/{__test__ => __test__.py} | 0 pym/portage/tests/lafilefixer/{__test__ => __test__.py} | 0 pym/portage/tests/lazyimport/{__test__ => __test__.py} | 0 pym/portage/tests/lint/{__test__ => __test__.py} | 0 pym/portage/tests/locks/{__test__ => __test__.py} | 0 pym/portage/tests/news/{__test__ => __test__.py} | 0 pym/portage/tests/process/{__test__ => __test__.py} | 0 pym/portage/tests/repoman/{__test__ => __test__.py} | 0 pym/portage/tests/resolver/{__test__ => __test__.py} | 0 pym/portage/tests/{runTests => runTests.py} | 0 pym/portage/tests/sets/base/{__test__ => __test__.py} | 0 pym/portage/tests/sets/files/{__test__ => __test__.py} | 0 pym/portage/tests/sets/shell/{__test__ => __test__.py} | 0 pym/portage/tests/unicode/{__test__ => __test__.py} | 0 pym/portage/tests/update/{__test__ => __test__.py} | 0 pym/portage/tests/util/{__test__ => __test__.py} | 0 pym/portage/tests/versions/{__test__ => __test__.py} | 0 pym/portage/tests/xpak/{__test__ => __test__.py} | 0 runtests.sh | 2 +- 29 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c8d873..52ca444 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,4 @@ python: - 3.4 - pypy script: - - python -b -Wd pym/portage/tests/runTests + - python -b -Wd pym/portage/tests/runTests.py diff --git a/Makefile b/Makefile index 92ea195..9eb6e66 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ epydoc: test: set -e; \ - "$(srcdir)/pym/portage/tests/runTests"; \ + "$(srcdir)/pym/portage/tests/runTests.py"; \ install: set -e; \ diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py index 84e732a..697b800 100644 --- a/pym/portage/tests/__init__.py +++ b/pym/portage/tests/__init__.py @@ -83,11 +83,11 @@ def getTestFromCommandLine(args, base_path): return result def getTestDirs(base_path): - TEST_FILE = b'__test__' + TEST_FILE = b'__test__.py' testDirs = [] # the os.walk help mentions relative paths as being quirky - # I was tired of adding dirs to the list, so now we add __test__ + # I was tired of adding dirs to the list, so now we add __test__.py # to each dir we want tested. for root, dirs, files in os.walk(base_path): try: diff --git a/pym/portage/tests/bin/__test__ b/pym/portage/tests/bin/__test__.py similarity index 100% rename from pym/portage/tests/bin/__test__ rename to pym/portage/tests/bin/__test__.py diff --git a/pym/portage/tests/dbapi/__test__ b/pym/portage/tests/dbapi/__test__.py similarity index 100% rename from pym/portage/tests/dbapi/__test__ rename to pym/portage/tests/dbapi/__test__.py diff --git a/pym/portage/tests/dep/__test__ b/pym/portage/tests/dep/__test__.py similarity index 100% rename from pym/portage/tests/dep/__test__ rename to pym/portage/tests/dep/__test__.py diff --git a/pym/portage/tests/ebuild/__test__ b/pym/portage/tests/ebuild/__test__.py similarity index 100% rename from pym/portage/tests/ebuild/__test__ rename to pym/portage/tests/ebuild/__test__.py diff --git a/pym/portage/tests/emerge/__test__ b/pym/portage/tests/emerge/__test__.py similarity index 100% rename from pym/portage/tests/emerge/__test__ rename to pym/portage/tests/emerge/__test__.py diff --git a/pym/portage/tests/env/__test__ b/pym/portage/tests/env/__test__.py similarity index 100% rename from pym/portage/tests/env/__test__ rename to pym/portage/tests/env/__test__.py diff --git a/pym/portage/tests/env/config/__test__ b/pym/portage/tests/env/config/__test__.py similarity index 100% rename from pym/portage/tests/env/config/__test__ rename to pym/portage/tests/env/config/__test__.py diff --git a/pym/portage/tests/glsa/__test__ b/pym/portage/tests/glsa/__test__.py similarity index 100% rename from pym/portage/tests/glsa/__test__ rename to pym/portage/tests/glsa/__test__.py diff --git a/pym/portage/tests/lafilefixer/__test__ b/pym/portage/tests/lafilefixer/__test__.py similarity index 100% rename from pym/portage/tests/lafilefixer/__test__ rename to pym/portage/tests/lafilefixer/__test__.py diff --git a/pym/portage/tests/lazyimport/__test__ b/pym/portage/tests/lazyimport/__test__.py similarity index 100% rename from pym/portage/tests/lazyimport/__test__ rename to pym/portage/tests/lazyimport/__test__.py diff --git a/pym/portage/tests/lint/__test__ b/pym/portage/tests/lint/__test__.py similarity index 100% rename from pym/portage/tests/lint/__test__ rename to pym/portage/tests/lint/__test__.py diff --git a/pym/portage/tests/locks/__test__ b/pym/portage/tests/locks/__test__.py similarity index 100% rename from pym/portage/tests/locks/__test__ rename to pym/portage/tests/locks/__test__.py diff --git a/pym/portage/tests/news/__test__ b/pym/portage/tests/news/__test__.py similarity index 100% rename from pym/portage/tests/news/__test__ rename to pym/portage/tests/news/__test__.py diff --git a/pym/portage/tests/process/__test__ b/pym/portage/tests/process/__test__.py similarity index 100% rename from pym/portage/tests/process/__test__ rename to pym/portage/tests/process/__test__.py diff --git a/pym/portage/tests/repoman/__test__ b/pym/portage/tests/repoman/__test__.py similarity index 100% rename from pym/portage/tests/repoman/__test__ rename to pym/portage/tests/repoman/__test__.py diff --git a/pym/portage/tests/resolver/__test__ b/pym/portage/tests/resolver/__test__.py similarity index 100% rename from pym/portage/tests/resolver/__test__ rename to pym/portage/tests/resolver/__test__.py diff --git a/pym/portage/tests/runTests b/pym/portage/tests/runTests.py similarity index 100% rename from pym/portage/tests/runTests rename to pym/portage/tests/runTests.py diff --git a/pym/portage/tests/sets/base/__test__ b/pym/portage/tests/sets/base/__test__.py similarity index 100% rename from pym/portage/tests/sets/base/__test__ rename to pym/portage/tests/sets/base/__test__.py diff --git a/pym/portage/tests/sets/files/__test__ b/pym/portage/tests/sets/files/__test__.py similarity index 100% rename from pym/portage/tests/sets/files/__test__ rename to pym/portage/tests/sets/files/__test__.py diff --git a/pym/portage/tests/sets/shell/__test__ b/pym/portage/tests/sets/shell/__test__.py similarity index 100% rename from pym/portage/tests/sets/shell/__test__ rename to pym/portage/tests/sets/shell/__test__.py diff --git a/pym/portage/tests/unicode/__test__ b/pym/portage/tests/unicode/__test__.py similarity index 100% rename from pym/portage/tests/unicode/__test__ rename to pym/portage/tests/unicode/__test__.py diff --git a/pym/portage/tests/update/__test__ b/pym/portage/tests/update/__test__.py similarity index 100% rename from pym/portage/tests/update/__test__ rename to pym/portage/tests/update/__test__.py diff --git a/pym/portage/tests/util/__test__ b/pym/portage/tests/util/__test__.py similarity index 100% rename from pym/portage/tests/util/__test__ rename to pym/portage/tests/util/__test__.py diff --git a/pym/portage/tests/versions/__test__ b/pym/portage/tests/versions/__test__.py similarity index 100% rename from pym/portage/tests/versions/__test__ rename to pym/portage/tests/versions/__test__.py diff --git a/pym/portage/tests/xpak/__test__ b/pym/portage/tests/xpak/__test__.py similarity index 100% rename from pym/portage/tests/xpak/__test__ rename to pym/portage/tests/xpak/__test__.py diff --git a/runtests.sh b/runtests.sh index 7999220..599727b 100755 --- a/runtests.sh +++ b/runtests.sh @@ -67,7 +67,7 @@ for version in ${PYTHON_VERSIONS}; do fi if [[ -x "${executable}" ]]; then echo -e "${GOOD}Testing with Python ${version}...${NORMAL}" - "${executable}" -b -Wd pym/portage/tests/runTests "$@" + "${executable}" -b -Wd pym/portage/tests/runTests.py "$@" status=$? status_array[${#status_array[@]}]=${status} found_versions[${#found_versions[@]}]=${version}