[gentoo-portage-dev] [PATCH 3/6] tests: Append .py to files that need to be installed

["Michał Górny" <mgorny@gentoo.org>]

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__            |  0
 pym/portage/tests/bin/__test__.py         |  0
 pym/portage/tests/dbapi/__test__          |  0
 pym/portage/tests/dbapi/__test__.py       |  0
 pym/portage/tests/dep/__test__            |  0
 pym/portage/tests/dep/__test__.py         |  0
 pym/portage/tests/ebuild/__test__         |  0
 pym/portage/tests/ebuild/__test__.py      |  0
 pym/portage/tests/emerge/__test__         |  0
 pym/portage/tests/emerge/__test__.py      |  0
 pym/portage/tests/env/__test__            |  0
 pym/portage/tests/env/__test__.py         |  0
 pym/portage/tests/env/config/__test__     |  0
 pym/portage/tests/env/config/__test__.py  |  0
 pym/portage/tests/glsa/__test__           |  0
 pym/portage/tests/glsa/__test__.py        |  0
 pym/portage/tests/lafilefixer/__test__    |  0
 pym/portage/tests/lafilefixer/__test__.py |  0
 pym/portage/tests/lazyimport/__test__     |  0
 pym/portage/tests/lazyimport/__test__.py  |  0
 pym/portage/tests/lint/__test__           |  0
 pym/portage/tests/lint/__test__.py        |  0
 pym/portage/tests/locks/__test__          |  0
 pym/portage/tests/locks/__test__.py       |  0
 pym/portage/tests/news/__test__           |  0
 pym/portage/tests/news/__test__.py        |  0
 pym/portage/tests/process/__test__        |  0
 pym/portage/tests/process/__test__.py     |  0
 pym/portage/tests/repoman/__test__        |  0
 pym/portage/tests/repoman/__test__.py     |  0
 pym/portage/tests/resolver/__test__       |  0
 pym/portage/tests/resolver/__test__.py    |  0
 pym/portage/tests/runTests                | 61 -------------------------------
 pym/portage/tests/runTests.py             | 61 +++++++++++++++++++++++++++++++
 pym/portage/tests/sets/base/__test__      |  0
 pym/portage/tests/sets/base/__test__.py   |  0
 pym/portage/tests/sets/files/__test__     |  0
 pym/portage/tests/sets/files/__test__.py  |  0
 pym/portage/tests/sets/shell/__test__     |  0
 pym/portage/tests/sets/shell/__test__.py  |  0
 pym/portage/tests/unicode/__test__        |  0
 pym/portage/tests/unicode/__test__.py     |  0
 pym/portage/tests/update/__test__         |  0
 pym/portage/tests/update/__test__.py      |  0
 pym/portage/tests/util/__test__           |  0
 pym/portage/tests/util/__test__.py        |  0
 pym/portage/tests/versions/__test__       |  0
 pym/portage/tests/versions/__test__.py    |  0
 pym/portage/tests/xpak/__test__           |  0
 pym/portage/tests/xpak/__test__.py        |  0
 runtests.sh                               |  2 +-
 54 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100644 pym/portage/tests/bin/__test__
 create mode 100644 pym/portage/tests/bin/__test__.py
 delete mode 100644 pym/portage/tests/dbapi/__test__
 create mode 100644 pym/portage/tests/dbapi/__test__.py
 delete mode 100644 pym/portage/tests/dep/__test__
 create mode 100644 pym/portage/tests/dep/__test__.py
 delete mode 100644 pym/portage/tests/ebuild/__test__
 create mode 100644 pym/portage/tests/ebuild/__test__.py
 delete mode 100644 pym/portage/tests/emerge/__test__
 create mode 100644 pym/portage/tests/emerge/__test__.py
 delete mode 100644 pym/portage/tests/env/__test__
 create mode 100644 pym/portage/tests/env/__test__.py
 delete mode 100644 pym/portage/tests/env/config/__test__
 create mode 100644 pym/portage/tests/env/config/__test__.py
 delete mode 100644 pym/portage/tests/glsa/__test__
 create mode 100644 pym/portage/tests/glsa/__test__.py
 delete mode 100644 pym/portage/tests/lafilefixer/__test__
 create mode 100644 pym/portage/tests/lafilefixer/__test__.py
 delete mode 100644 pym/portage/tests/lazyimport/__test__
 create mode 100644 pym/portage/tests/lazyimport/__test__.py
 delete mode 100644 pym/portage/tests/lint/__test__
 create mode 100644 pym/portage/tests/lint/__test__.py
 delete mode 100644 pym/portage/tests/locks/__test__
 create mode 100644 pym/portage/tests/locks/__test__.py
 delete mode 100644 pym/portage/tests/news/__test__
 create mode 100644 pym/portage/tests/news/__test__.py
 delete mode 100644 pym/portage/tests/process/__test__
 create mode 100644 pym/portage/tests/process/__test__.py
 delete mode 100644 pym/portage/tests/repoman/__test__
 create mode 100644 pym/portage/tests/repoman/__test__.py
 delete mode 100644 pym/portage/tests/resolver/__test__
 create mode 100644 pym/portage/tests/resolver/__test__.py
 delete mode 100755 pym/portage/tests/runTests
 create mode 100755 pym/portage/tests/runTests.py
 delete mode 100644 pym/portage/tests/sets/base/__test__
 create mode 100644 pym/portage/tests/sets/base/__test__.py
 delete mode 100644 pym/portage/tests/sets/files/__test__
 create mode 100644 pym/portage/tests/sets/files/__test__.py
 delete mode 100644 pym/portage/tests/sets/shell/__test__
 create mode 100644 pym/portage/tests/sets/shell/__test__.py
 delete mode 100644 pym/portage/tests/unicode/__test__
 create mode 100644 pym/portage/tests/unicode/__test__.py
 delete mode 100644 pym/portage/tests/update/__test__
 create mode 100644 pym/portage/tests/update/__test__.py
 delete mode 100644 pym/portage/tests/util/__test__
 create mode 100644 pym/portage/tests/util/__test__.py
 delete mode 100644 pym/portage/tests/versions/__test__
 create mode 100644 pym/portage/tests/versions/__test__.py
 delete mode 100644 pym/portage/tests/xpak/__test__
 create mode 100644 pym/portage/tests/xpak/__test__.py

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__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/bin/__test__.py b/pym/portage/tests/bin/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/dbapi/__test__ b/pym/portage/tests/dbapi/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/dbapi/__test__.py b/pym/portage/tests/dbapi/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/dep/__test__ b/pym/portage/tests/dep/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/dep/__test__.py b/pym/portage/tests/dep/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/ebuild/__test__ b/pym/portage/tests/ebuild/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/ebuild/__test__.py b/pym/portage/tests/ebuild/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/emerge/__test__ b/pym/portage/tests/emerge/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/emerge/__test__.py b/pym/portage/tests/emerge/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/env/__test__ b/pym/portage/tests/env/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/env/__test__.py b/pym/portage/tests/env/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/env/config/__test__ b/pym/portage/tests/env/config/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/env/config/__test__.py b/pym/portage/tests/env/config/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/glsa/__test__ b/pym/portage/tests/glsa/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/glsa/__test__.py b/pym/portage/tests/glsa/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/lafilefixer/__test__ b/pym/portage/tests/lafilefixer/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/lafilefixer/__test__.py b/pym/portage/tests/lafilefixer/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/lazyimport/__test__ b/pym/portage/tests/lazyimport/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/lazyimport/__test__.py b/pym/portage/tests/lazyimport/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/lint/__test__ b/pym/portage/tests/lint/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/lint/__test__.py b/pym/portage/tests/lint/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/locks/__test__ b/pym/portage/tests/locks/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/locks/__test__.py b/pym/portage/tests/locks/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/news/__test__ b/pym/portage/tests/news/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/news/__test__.py b/pym/portage/tests/news/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/process/__test__ b/pym/portage/tests/process/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/process/__test__.py b/pym/portage/tests/process/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/repoman/__test__ b/pym/portage/tests/repoman/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/repoman/__test__.py b/pym/portage/tests/repoman/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/resolver/__test__ b/pym/portage/tests/resolver/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/resolver/__test__.py b/pym/portage/tests/resolver/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/runTests b/pym/portage/tests/runTests
deleted file mode 100755
index 9c45276..0000000
--- a/pym/portage/tests/runTests
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/python -bWd
-# runTests.py -- Portage Unit Test Functionality
-# Copyright 2006-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-import os, sys
-import os.path as osp
-import grp
-import platform
-import pwd
-import signal
-
-def debug_signal(signum, frame):
-	import pdb
-	pdb.set_trace()
-
-if platform.python_implementation() == 'Jython':
-	debug_signum = signal.SIGUSR2 # bug #424259
-else:
-	debug_signum = signal.SIGUSR1
-
-signal.signal(debug_signum, debug_signal)
-
-# Pretend that the current user's uid/gid are the 'portage' uid/gid,
-# so things go smoothly regardless of the current user and global
-# user/group configuration.
-os.environ["PORTAGE_USERNAME"] = pwd.getpwuid(os.getuid()).pw_name
-os.environ["PORTAGE_GRPNAME"] = grp.getgrgid(os.getgid()).gr_name
-
-# Insert our parent dir so we can do shiny import "tests"
-# This line courtesy of Marienz and Pkgcore ;)
-sys.path.insert(0, osp.dirname(osp.dirname(osp.dirname(osp.realpath(__file__)))))
-
-import portage
-portage._internal_caller = True
-
-# Ensure that we don't instantiate portage.settings, so that tests should
-# work the same regardless of global configuration file state/existence.
-portage._disable_legacy_globals()
-
-if os.environ.get('NOCOLOR') in ('yes', 'true'):
-	portage.output.nocolor()
-
-import portage.tests as tests
-from portage.const import PORTAGE_BIN_PATH
-path = os.environ.get("PATH", "").split(":")
-path = [x for x in path if x]
-
-insert_bin_path = True
-try:
-	insert_bin_path = not path or \
-		not os.path.samefile(path[0], PORTAGE_BIN_PATH)
-except OSError:
-	pass
-
-if insert_bin_path:
-	path.insert(0, PORTAGE_BIN_PATH)
-	os.environ["PATH"] = ":".join(path)
-
-if __name__ == "__main__":
-	sys.exit(tests.main())
diff --git a/pym/portage/tests/runTests.py b/pym/portage/tests/runTests.py
new file mode 100755
index 0000000..9c45276
--- /dev/null
+++ b/pym/portage/tests/runTests.py
@@ -0,0 +1,61 @@
+#!/usr/bin/python -bWd
+# runTests.py -- Portage Unit Test Functionality
+# Copyright 2006-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+import os, sys
+import os.path as osp
+import grp
+import platform
+import pwd
+import signal
+
+def debug_signal(signum, frame):
+	import pdb
+	pdb.set_trace()
+
+if platform.python_implementation() == 'Jython':
+	debug_signum = signal.SIGUSR2 # bug #424259
+else:
+	debug_signum = signal.SIGUSR1
+
+signal.signal(debug_signum, debug_signal)
+
+# Pretend that the current user's uid/gid are the 'portage' uid/gid,
+# so things go smoothly regardless of the current user and global
+# user/group configuration.
+os.environ["PORTAGE_USERNAME"] = pwd.getpwuid(os.getuid()).pw_name
+os.environ["PORTAGE_GRPNAME"] = grp.getgrgid(os.getgid()).gr_name
+
+# Insert our parent dir so we can do shiny import "tests"
+# This line courtesy of Marienz and Pkgcore ;)
+sys.path.insert(0, osp.dirname(osp.dirname(osp.dirname(osp.realpath(__file__)))))
+
+import portage
+portage._internal_caller = True
+
+# Ensure that we don't instantiate portage.settings, so that tests should
+# work the same regardless of global configuration file state/existence.
+portage._disable_legacy_globals()
+
+if os.environ.get('NOCOLOR') in ('yes', 'true'):
+	portage.output.nocolor()
+
+import portage.tests as tests
+from portage.const import PORTAGE_BIN_PATH
+path = os.environ.get("PATH", "").split(":")
+path = [x for x in path if x]
+
+insert_bin_path = True
+try:
+	insert_bin_path = not path or \
+		not os.path.samefile(path[0], PORTAGE_BIN_PATH)
+except OSError:
+	pass
+
+if insert_bin_path:
+	path.insert(0, PORTAGE_BIN_PATH)
+	os.environ["PATH"] = ":".join(path)
+
+if __name__ == "__main__":
+	sys.exit(tests.main())
diff --git a/pym/portage/tests/sets/base/__test__ b/pym/portage/tests/sets/base/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/sets/base/__test__.py b/pym/portage/tests/sets/base/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/sets/files/__test__ b/pym/portage/tests/sets/files/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/sets/files/__test__.py b/pym/portage/tests/sets/files/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/sets/shell/__test__ b/pym/portage/tests/sets/shell/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/sets/shell/__test__.py b/pym/portage/tests/sets/shell/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/unicode/__test__ b/pym/portage/tests/unicode/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/unicode/__test__.py b/pym/portage/tests/unicode/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/update/__test__ b/pym/portage/tests/update/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/update/__test__.py b/pym/portage/tests/update/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/util/__test__ b/pym/portage/tests/util/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/util/__test__.py b/pym/portage/tests/util/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/versions/__test__ b/pym/portage/tests/versions/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/versions/__test__.py b/pym/portage/tests/versions/__test__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pym/portage/tests/xpak/__test__ b/pym/portage/tests/xpak/__test__
deleted file mode 100644
index e69de29..0000000
diff --git a/pym/portage/tests/xpak/__test__.py b/pym/portage/tests/xpak/__test__.py
new file mode 100644
index 0000000..e69de29
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}
-- 
2.0.4