THRIFT-5087 test/test.py fails with "AssertionError: Python 3.3 or later is required for proper operation."
Client: Python
Patch: Jano Svitok
This closes #2055
THRIFT-5087: Show features log, check log presence
THRIFT-5087: Revert/Improve PR1995 (commit f8b004081da)
Make the condition work both
a) when both python2 and python3 are installed
b) when only python3 is installed
Check also python 3.8 when searching for 3.x
diff --git a/build/docker/scripts/cross-test.sh b/build/docker/scripts/cross-test.sh
index 43581a5..0b6748a 100755
--- a/build/docker/scripts/cross-test.sh
+++ b/build/docker/scripts/cross-test.sh
@@ -10,7 +10,12 @@
RET=$?
if [ $RET -ne 0 ]; then
- cat test/log/unexpected_failures.log
+ if [ -f "test/features/log/unexpected_failures.log" ]; then
+ cat "test/features/log/unexpected_failures.log"
+ fi
+ if [ -f "test/log/unexpected_failures.log" ]; then
+ cat "test/log/unexpected_failures.log"
+ fi
fi
exit $RET