diff options
Diffstat (limited to 'python/tests')
| -rw-r--r-- | python/tests/Android.bp | 28 | ||||
| -rw-r--r-- | python/tests/dont_import_folder_of_entrypoint/Android.bp | 14 | ||||
| -rw-r--r-- | python/tests/par_test.py | 9 | ||||
| -rw-r--r-- | python/tests/py-cmd_test.py | 18 | ||||
| -rwxr-xr-x | python/tests/runtest.sh | 26 | ||||
| -rw-r--r-- | python/tests/testpkg/par_test.py | 6 |
6 files changed, 30 insertions, 71 deletions
diff --git a/python/tests/Android.bp b/python/tests/Android.bp index a65685960..056f7eddd 100644 --- a/python/tests/Android.bp +++ b/python/tests/Android.bp @@ -27,32 +27,4 @@ python_test_host { test_options: { unit_test: false, }, - version: { - py2: { - enabled: true, - embedded_launcher: true, - }, - py3: { - enabled: false, - embedded_launcher: true, - }, - }, -} - -python_test_host { - name: "par_test3", - main: "par_test.py", - srcs: [ - "par_test.py", - "testpkg/par_test.py", - ], - // Is not implemented as a python unittest - test_options: { - unit_test: false, - }, - version: { - py3: { - embedded_launcher: true, - }, - }, } diff --git a/python/tests/dont_import_folder_of_entrypoint/Android.bp b/python/tests/dont_import_folder_of_entrypoint/Android.bp index e54e9b2c0..ab2e314be 100644 --- a/python/tests/dont_import_folder_of_entrypoint/Android.bp +++ b/python/tests/dont_import_folder_of_entrypoint/Android.bp @@ -10,17 +10,3 @@ python_test_host { "mypkg/mymodule.py", ], } - -python_test_host { - name: "py_dont_import_folder_of_entrypoint_test_embedded_launcher", - main: "mypkg/main.py", - srcs: [ - "mypkg/main.py", - "mypkg/mymodule.py", - ], - version: { - py3: { - embedded_launcher: true, - }, - }, -} diff --git a/python/tests/par_test.py b/python/tests/par_test.py index 1e03f1669..96b42ae83 100644 --- a/python/tests/par_test.py +++ b/python/tests/par_test.py @@ -33,6 +33,8 @@ if fileName.endswith('.pyc'): assert_equal("os.path.basename(__file__)", fileName, "par_test.py") archive = os.path.dirname(__file__) +major = sys.version_info.major +minor = sys.version_info.minor assert_equal("__package__", __package__, "") assert_equal("sys.argv[0]", sys.argv[0], archive) @@ -42,10 +44,11 @@ assert_equal("sys.prefix", sys.prefix, archive) assert_equal("__loader__.archive", __loader__.archive, archive) assert_equal("site.ENABLE_USER_SITE", site.ENABLE_USER_SITE, None) -assert_equal("len(sys.path)", len(sys.path), 3) +assert_equal("len(sys.path)", len(sys.path), 4) assert_equal("sys.path[0]", sys.path[0], archive) -assert_equal("sys.path[1]", sys.path[1], os.path.join(archive, "internal")) -assert_equal("sys.path[2]", sys.path[2], os.path.join(archive, "internal", "stdlib")) +assert_equal("sys.path[1]", sys.path[1], os.path.join(archive, "internal", f"python{major}{minor}.zip")) +assert_equal("sys.path[2]", sys.path[2], os.path.join(archive, "internal", f"python{major}.{minor}")) +assert_equal("sys.path[3]", sys.path[3], os.path.join(archive, "internal", f"python{major}.{minor}", "lib-dynload")) if os.getenv('ARGTEST', False): assert_equal("len(sys.argv)", len(sys.argv), 3) diff --git a/python/tests/py-cmd_test.py b/python/tests/py-cmd_test.py index acda2d742..8aed78289 100644 --- a/python/tests/py-cmd_test.py +++ b/python/tests/py-cmd_test.py @@ -55,22 +55,22 @@ assert_equal("sys.exec_prefix", sys.exec_prefix, sys.executable) assert_equal("sys.prefix", sys.prefix, sys.executable) assert_equal("site.ENABLE_USER_SITE", site.ENABLE_USER_SITE, None) -if sys.version_info[0] == 2: +major = sys.version_info.major +minor = sys.version_info.minor + +if major == 2: assert_equal("len(sys.path)", len(sys.path), 4) - assert_equal("sys.path[0]", sys.path[0], os.path.dirname(__file__)) + assert_equal("sys.path[0]", sys.path[0], os.path.abspath(os.path.dirname(__file__))) assert_equal("sys.path[1]", sys.path[1], "/extra") assert_equal("sys.path[2]", sys.path[2], os.path.join(sys.executable, "internal")) assert_equal("sys.path[3]", sys.path[3], os.path.join(sys.executable, "internal", "stdlib")) else: - assert_equal("len(sys.path)", len(sys.path), 8) + assert_equal("len(sys.path)", len(sys.path), 5) assert_equal("sys.path[0]", sys.path[0], os.path.abspath(os.path.dirname(__file__))) assert_equal("sys.path[1]", sys.path[1], "/extra") - assert_equal("sys.path[2]", sys.path[2], os.path.join(sys.executable, 'lib', 'python' + str(sys.version_info[0]) + str(sys.version_info[1]) + '.zip')) - assert_equal("sys.path[3]", sys.path[3], os.path.join(sys.executable, 'lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), '..')) - assert_equal("sys.path[4]", sys.path[4], os.path.join(sys.executable, 'lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]))) - assert_equal("sys.path[5]", sys.path[5], os.path.join(sys.executable, 'lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'lib-dynload')) - assert_equal("sys.path[6]", sys.path[6], os.path.join(sys.executable, "internal")) - assert_equal("sys.path[7]", sys.path[7], os.path.join(sys.executable, "internal", "stdlib")) + assert_equal("sys.path[2]", sys.path[2], os.path.join(sys.executable, 'internal', 'python' + str(sys.version_info[0]) + str(sys.version_info[1]) + '.zip')) + assert_equal("sys.path[3]", sys.path[3], os.path.join(sys.executable, 'internal', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]))) + assert_equal("sys.path[4]", sys.path[4], os.path.join(sys.executable, 'internal', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'lib-dynload')) if failed: sys.exit(1) diff --git a/python/tests/runtest.sh b/python/tests/runtest.sh index 35941dc88..c44ec582a 100755 --- a/python/tests/runtest.sh +++ b/python/tests/runtest.sh @@ -24,12 +24,16 @@ if [ -z $ANDROID_HOST_OUT ]; then fi if [[ ( ! -f $ANDROID_HOST_OUT/nativetest64/par_test/par_test ) || - ( ! -f $ANDROID_HOST_OUT/nativetest64/par_test3/par_test3 ) || - ( ! -f $ANDROID_HOST_OUT/bin/py2-cmd ) || ( ! -f $ANDROID_HOST_OUT/bin/py3-cmd )]]; then - echo "Run 'm par_test par_test3 py2-cmd py3-cmd' first" + echo "Run 'm par_test py2-cmd py3-cmd' first" exit 1 fi +if [ $(uname -s) = Linux ]; then + if [[ ! -f $ANDROID_HOST_OUT/bin/py2-cmd ]]; then + echo "Run 'm par_test py2-cmd py3-cmd' first" + exit 1 + fi +fi export LD_LIBRARY_PATH=$ANDROID_HOST_OUT/lib64 @@ -41,19 +45,17 @@ PYTHONPATH=/usr $ANDROID_HOST_OUT/nativetest64/par_test/par_test ARGTEST=true $ANDROID_HOST_OUT/nativetest64/par_test/par_test --arg1 arg2 -PYTHONHOME= PYTHONPATH= $ANDROID_HOST_OUT/nativetest64/par_test3/par_test3 -PYTHONHOME=/usr $ANDROID_HOST_OUT/nativetest64/par_test3/par_test3 -PYTHONPATH=/usr $ANDROID_HOST_OUT/nativetest64/par_test3/par_test3 - -ARGTEST=true $ANDROID_HOST_OUT/nativetest64/par_test3/par_test3 --arg1 arg2 - cd $(dirname ${BASH_SOURCE[0]}) -PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py2-cmd py-cmd_test.py +if [ $(uname -s) = Linux ]; then + PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py2-cmd py-cmd_test.py +fi PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py3-cmd py-cmd_test.py -ARGTEST=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py2-cmd py-cmd_test.py arg1 arg2 -ARGTEST2=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py2-cmd py-cmd_test.py --arg1 arg2 +if [ $(uname -s) = Linux ]; then + ARGTEST=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py2-cmd py-cmd_test.py arg1 arg2 + ARGTEST2=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py2-cmd py-cmd_test.py --arg1 arg2 +fi ARGTEST=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py3-cmd py-cmd_test.py arg1 arg2 ARGTEST2=true PYTHONPATH=/extra $ANDROID_HOST_OUT/bin/py3-cmd py-cmd_test.py --arg1 arg2 diff --git a/python/tests/testpkg/par_test.py b/python/tests/testpkg/par_test.py index b51340907..e12c527ad 100644 --- a/python/tests/testpkg/par_test.py +++ b/python/tests/testpkg/par_test.py @@ -33,11 +33,7 @@ if fileName.endswith('.pyc'): fileName = fileName[:-1] assert_equal("__file__", fileName, os.path.join(archive, "testpkg/par_test.py")) -# Python3 is returning None here for me, and I haven't found any problems caused by this. -if sys.version_info[0] == 2: - assert_equal("__package__", __package__, "testpkg") -else: - assert_equal("__package__", __package__, None) +assert_equal("__package__", __package__, "testpkg") assert_equal("__loader__.archive", __loader__.archive, archive) assert_equal("__loader__.prefix", __loader__.prefix, "testpkg/") |