Split product tests into short and long running groups

Author: zachyee

.travis.yml

@@ -9,11 +9,11 @@ env:
   global:
     - PA_TEST_ONLINE_INSTALLER=true
     - PYTHONPATH=$(pwd)
+    - LONG_PRODUCT_TESTS="tests/product/test_server_install.py tests/product/test_status.py tests/product/test_collect.py tests/product/test_connectors.py tests/product/test_control.py tests/product/test_server_uninstall.py"
   matrix:
     - OTHER_TESTS=true
     - SHORT_PRODUCT_TEST_GROUP=0
     - SHORT_PRODUCT_TEST_GROUP=1
-    - SHORT_PRODUCT_TEST_GROUP=2
     - LONG_PRODUCT_TEST_GROUP_STANDALONE_PRESTO_ADMIN="tests/product/test_server_install.py"
     - LONG_PRODUCT_TEST_GROUP_STANDALONE_PRESTO_ADMIN_AND_PRESTO="tests/product/test_status.py"
     - LONG_PRODUCT_TEST_GROUP_STANDALONE_PRESTO_ADMIN_AND_PRESTO="tests/product/test_collect.py"
@@ -26,29 +26,38 @@ install:
 before_script:
   - make docker-images
   - make presto-server-rpm.rpm
+  - PYTHON_VERSION=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))')
+  - |
+    if [[ ! $PYTHON_VERSION < "2.6" ]] && [[ $PYTHON_VERSION < "2.7" ]]; then
+      TOX_PYTHON_VERSION="py26"
+    elif [[ ! $PYTHON_VERSION < "2.7" ]] && [[ $PYTHON_VERSION < "2.8" ]]; then
+      TOX_PYTHON_VERSION="py27"
+    else
+      echo "Invalid version of python: "$PYTHON_VERSION && exit 1
+    fi
 script:
   - |
     if [ -v SHORT_PRODUCT_TEST_GROUP ]; then
       ALL_PRODUCT_TESTS=$(find tests/product/ -name 'test_*py' | grep -v __init__ | xargs wc -l | sort -n | head -n -1 | awk '{print $2}' | tr '\n' ' ');
       for LONG_PRODUCT_TEST in ${LONG_PRODUCT_TESTS[@]}; do
         ALL_PRODUCT_TESTS=${ALL_PRODUCT_TESTS//$LONG_PRODUCT_TEST/};
-      done
-      make test-images
-      SHORT_PRODUCT_TESTS=$(echo $ALL_PRODUCT_TESTS | tr ' ' '\n' | awk "NR % 3 == $SHORT_PRODUCT_TEST_GROUP" | tr '\n' ' ');
+      done 
+      SHORT_PRODUCT_TESTS=$(echo $ALL_PRODUCT_TESTS | tr ' ' '\n' | awk "NR % 2 == $SHORT_PRODUCT_TEST_GROUP" | tr '\n' ' ');
+      make test-images &&
       tox -e $TOX_PYTHON_VERSION -- -a '!quarantine,!offline_installer' ${SHORT_PRODUCT_TESTS};
     elif [ -v LONG_PRODUCT_TEST_GROUP_STANDALONE_PRESTO_ADMIN ]; then
       export IMAGE_NAMES="standalone_presto_admin";
       make test-images &&
       tox -e $TOX_PYTHON_VERSION -- -a '!quarantine,!offline_installer' ${LONG_PRODUCT_TEST_GROUP_STANDALONE_PRESTO_ADMIN};
-    elif [ -v LONG_PRODUCT_TEST_GROUP_STANDALONE_PRESTO_ADMIN_AND_PRESTO]; then
+    elif [ -v LONG_PRODUCT_TEST_GROUP_STANDALONE_PRESTO_ADMIN_AND_PRESTO ]; then
       export IMAGE_NAMES="standalone_presto standalone_presto_admin";
       make test-images &&
-      tox -e $TOX_PYTHON_VERSION -- -a '!quarantine,!offline_installer' ${LONG_PRODCUT_TEST_GROUP_STANDALONE_PRESTO_ADMIN_AND_PRESTO};
+      tox -e $TOX_PYTHON_VERSION -- -a '!quarantine,!offline_installer' ${LONG_PRODUCT_TEST_GROUP_STANDALONE_PRESTO_ADMIN_AND_PRESTO};
     elif [ -v OTHER_TESTS ]; then
-      make clean lint dist docs test-rpm
-      nosetests --with-timer --timer-ok 60s --timer-warning 300s -s tests.unit
-      nosetests --with-timer --timer-ok 60s --timer-warning 300s -s tests.integration
+      make clean lint dist docs test-rpm &&
+      nosetests -s tests.unit &&
+      nosetests -s tests.integration;
     else
-      echo "Unknown test"
-      exit 1
+      echo "Unknown test" &&
+      exit 1;
     fi