SNOW-267170 fix pr-head and test running script bug (#607)

Author: sfc-gh-mkeller

ci/test_linux.sh

@@ -28,18 +28,18 @@ mv ${CONNECTOR_DIR}/test/parameters_jenkins.py ${CONNECTOR_DIR}/test/parameters.
 
 # Run tests
 cd $CONNECTOR_DIR
-if [[ -z "$is_old_driver" ]]; then
+if [[ "$is_old_driver" == "true" ]]; then
+    # Old Driver Test
+    echo "[Info] Running old connector tests"
+    python3 -m tox -e olddriver
+else
     for PYTHON_VERSION in ${PYTHON_VERSIONS}; do
         echo "[Info] Testing with ${PYTHON_VERSION}"
         SHORT_VERSION=$(python3 -c "print('${PYTHON_VERSION}'.replace('.', ''))")
         CONNECTOR_WHL=$(ls $CONNECTOR_DIR/dist/snowflake_connector_python*cp${SHORT_VERSION}*manylinux2010*.whl | sort -r | head -n 1)
-        TEST_ENVLIST=fix_lint,py${SHORT_VERSION}-{extras,unit,integ,pandas,sso}-ci,coverage
+        TEST_ENVLIST=fix_lint,py${SHORT_VERSION}-{extras,unit,integ,pandas,sso}-ci,py${SHORT_VERSION}-coverage
         echo "[Info] Running tox for ${TEST_ENVLIST}"
 
         python3 -m tox -e ${TEST_ENVLIST} --external_wheels ${CONNECTOR_WHL}
     done
-else
-    # Old Driver Test
-    echo "[Info] Running old connector tests"
-    python3 -m tox -e olddriver
 fi

test/integ/test_key_pair_authentication.py

@@ -14,6 +14,7 @@
 import snowflake.connector
 
 
+@pytest.mark.skipolddriver
 def test_different_key_length(is_public_test, request, conn_cnx, db_parameters):
     if is_public_test:
         pytest.skip('This test requires ACCOUNTADMIN privilege to set the public key')
@@ -63,6 +64,7 @@ def fin():
                 pass
 
 
+@pytest.mark.skipolddriver
 def test_multiple_key_pair(is_public_test, request, conn_cnx, db_parameters):
     if is_public_test:
         pytest.skip('This test requires ACCOUNTADMIN privilege to set the public key')

tox.ini

@@ -94,7 +94,7 @@ commands =
     {env:SNOWFLAKE_PYTEST_CMD} -m "not skipolddriver" -vvv {posargs:} test
 
 [testenv:coverage]
-description = [run locally after tests]: combine coverage data and create report;
+description = [run locally after tests]: combine coverage data and create report
 ;              generates a diff coverage against origin/master (can be changed by setting DIFF_AGAINST env var)
 deps = {[testenv]deps}
        coverage
@@ -109,6 +109,16 @@ commands = coverage combine
 ;           diff-cover --compare-branch {env:DIFF_AGAINST:origin/master} {toxworkdir}/coverage.xml
 depends = py35, py36, py37, py38
 
+[testenv:py{36,37,38}-coverage]
+# I hate doing this, but this env is for Jenkins, please keep it up-to-date with the one env above it if necessary
+description = [run locally after tests]: combine coverage data and create report specifically with {basepython}
+deps = {[testenv:coverage]deps}
+skip_install = {[testenv:coverage]skip_install}
+passenv = {[testenv:coverage]passenv}
+setenv = {[testenv:coverage]setenv}
+commands = {[testenv:coverage]commands}
+depends = {[testenv:coverage]depends}
+
 [testenv:flake8]
 ; DEPRECATED
 description = check code style with flake8
@@ -118,6 +128,7 @@ commands = flake8 {posargs}
 
 [testenv:fix_lint]
 description = format the code base to adhere to our styles, and complain about what we cannot do automatically
+basepython = python3.6
 passenv =
     PROGRAMDATA
 deps =