Revisit run tests (#262)

* migrate run_tests.py to use TestRunnerBase * remove accidentally added tests/coverage.json * revisit run_tests.py * revisit run_tests.py * revisit run_tests.py * revisit run_tests.py * revisit run_tests.py * revisit run_tests.py * revisit run_tests.py * revisit run_tests.py * revisit run_tests.py * revisit run_tests.py * revisit run_tests.py * revisit run_tests.py * add cacert.pem in run_tests.py when running cdms test within the lab * add cacert.pem in run_tests.py when running cdms test within the lab * add cacert.pem in run_tests.py when running cdms test within the lab * add cacert.pem in run_tests.py when running cdms test within the lab - rerun tests * add cacert.pem in run_tests.py when running cdms test within the lab - remove install from -c cdat/label/unstable * put back -c cdat/label/unstable
CDAT · Aug 8, 2018 · 9bbf339 · 9bbf339
1 parent f6c041d
commit 9bbf339
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 289 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,8 +22,8 @@ aliases:
        conda config --set always_yes yes --set changeps1 no
        conda update -y -q conda
        conda config --set anaconda_upload no
-       conda create -n py3 -c cdat/label/unstable -c cdat/label/nightly -c conda-forge -c cdat libcf distarray cdtime libcdms cdat_info numpy esmf esmpy libdrs_f pyopenssl nose requests flake8 myproxyclient "python>3"
-       conda create -n py2 -c cdat/label/unstable -c cdat/label/nightly -c conda-forge -c cdat libcf distarray cdtime libcdms cdat_info numpy esmf esmpy libdrs_f pyopenssl nose requests flake8 "python<3"
+       conda create -n py3 -c cdat/label/unstable -c cdat/label/nightly -c conda-forge -c cdat libcf distarray cdtime libcdms cdat_info testsrunner numpy esmf esmpy libdrs_f pyopenssl nose requests flake8 myproxyclient "python>3"
+       conda create -n py2 -c cdat/label/unstable -c cdat/label/nightly -c conda-forge -c cdat libcf distarray cdtime libcdms cdat_info testsrunner numpy esmf esmpy libdrs_f pyopenssl nose requests flake8 myproxyclient "python<3"
        if [ $(uname) == "Linux" ]; then
            conda install -n py3 -c cdat/label/unstable -c cdat/label/nightly -c conda-forge gcc_linux-64
            conda install -n py2 -c cdat/label/unstable -c cdat/label/nightly -c conda-forge gcc_linux-64
@@ -38,17 +38,10 @@ aliases:
        export PATH=$HOME/project/$WORKDIR/miniconda/bin:$PATH
        export UVCDAT_ANONYMOUS_LOG=False
        source activate py3
-       mkdir $HOME/.esg
-       echo "Get ESGF certificates"
-       echo ${ESGF_PWD} | myproxyclient logon -s esgf-node.llnl.gov -p 7512 -t 12 -S -b -l ${ESGF_USER} -o $HOME/.esg/esgf.cert
-       echo "Create .dods_cookies"
-       curl -L  -v   -c $HOME/.esg/.dods_cookies --cert $HOME/.esg/esgf.cert  --key $HOME/.esg/esgf.cert "https://aims3.llnl.gov/thredds/dodsC/cmip5_css02_data/cmip5/output1/CMCC/CMCC-CM/decadal2005/mon/atmos/Amon/r1i1p1/cct/1/cct_Amon_CMCC-CM_decadal2005_r1i1p1_202601-203512.nc.dds"
        if [ $(uname) == "Linux" ];then
-         cp tests/dodsrccircleciLinux $HOME/.dodsrc
          export LDSHARED="$CC -shared -pthread"
          LDSHARED="$CC -shared -pthread" python setup.py install
        else
-         cp tests/dodsrccircleciDarwin $HOME/.dodsrc
          python setup.py install
        fi
        source activate py2
@@ -67,11 +60,11 @@ aliases:
        export UVCDAT_ANONYMOUS_LOG=False
        set -e
        source activate py2
-       python run_tests.py -v2 
+       python run_tests.py --subdir -v2 
        PY2_RESULT=$?
-       echo "*** py2 test result: "${PY2_RESULT}
+       echo "**** py2 test result: "${PY2_RESULT}
        source activate py3
-       python run_tests.py -v2 
+       python run_tests.py --subdir -v2 
        PY3_RESULT=$?
        echo "*** py3 test result: "${PY3_RESULT}
        echo  $PY2_RESULT > $HOME/project/$WORKDIR/py2_result.txt