File tree Expand file tree Collapse file tree 5 files changed +15
-12
lines changed Expand file tree Collapse file tree 5 files changed +15
-12
lines changed Original file line number Diff line number Diff line change @@ -332,5 +332,6 @@ after_script:
332332 - echo "after_script start"
333333 - ci/install_test.sh
334334 - source activate pandas && python -c "import pandas; pandas.show_versions();"
335- - ci/print_skipped.py /tmp/pytest.xml
335+ - ci/print_skipped.py /tmp/single.xml
336+ - ci/print_skipped.py /tmp/multiple.xml
336337 - echo "after_script done"
Original file line number Diff line number Diff line change 112112source activate pandas
113113
114114pip install pytest-xdist
115+
115116if [ " $LINT " ]; then
116117 conda install flake8
117118 pip install cpplint
Original file line number Diff line number Diff line change @@ -30,20 +30,21 @@ def parse_results(filename):
3030 i += 1
3131 assert i - 1 == len (skipped )
3232 assert i - 1 == len (skipped )
33- assert len (skipped ) == int (root .attrib ['skip' ])
33+ # assert len(skipped) == int(root.attrib['skip'])
3434 return '\n ' .join (skipped )
3535
3636
3737def main (args ):
3838 print ('SKIPPED TESTS:' )
39- print (parse_results (args .filename ))
39+ for fn in args .filename :
40+ print (parse_results (fn ))
4041 return 0
4142
4243
4344def parse_args ():
4445 import argparse
4546 parser = argparse .ArgumentParser ()
46- parser .add_argument ('filename' , help = 'XUnit file to parse' )
47+ parser .add_argument ('filename' , nargs = '+' , help = 'XUnit file to parse' )
4748 return parser .parse_args ()
4849
4950
Original file line number Diff line number Diff line change 2020if [ " $BUILD_TEST " ]; then
2121 echo " We are not running pytest as this is simply a build test."
2222elif [ " $COVERAGE " ]; then
23- echo pytest -s -n 2 -m " not single" --cov=pandas --cov-append --cov-report xml:/tmp/pytest .xml $TEST_ARGS pandas
24- pytest -s -n 2 -m " not single" --cov=pandas --cov-append --cov-report xml:/tmp/pytest .xml $TEST_ARGS pandas
23+ echo pytest -s -n 2 -m " not single" --cov=pandas --cov-append --cov-report xml:/tmp/cov.xml --junitxml=/tmp/multiple .xml $TEST_ARGS pandas
24+ pytest -s -n 2 -m " not single" --cov=pandas --cov-append --cov-report xml:/tmp/cov.xml --junitxml=/tmp/multiple .xml $TEST_ARGS pandas
2525else
26- echo pytest -n 2 -m " not single" $TEST_ARGS pandas
27- pytest -n 2 -m " not single" $TEST_ARGS pandas # TODO: doctest
26+ echo pytest -n 2 -m " not single" --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
27+ pytest -n 2 -m " not single" --junitxml=/tmp/multiple.xml $TEST_ARGS pandas # TODO: doctest
2828fi
2929
3030RET=" $? "
Original file line number Diff line number Diff line change 2020if [ " $BUILD_TEST " ]; then
2121 echo " We are not running pytest as this is simply a build test."
2222elif [ " $COVERAGE " ]; then
23- echo pytest -s -m " single" --cov=pandas --cov-report xml:/tmp/pytest .xml $TEST_ARGS pandas
24- pytest -s -m " single" --cov=pandas --cov-report xml:/tmp/pytest .xml $TEST_ARGS pandas
23+ echo pytest -s -m " single" --cov=pandas --cov-report xml:/tmp/cov.xml --junitxml=/tmp/single .xml $TEST_ARGS pandas
24+ pytest -s -m " single" --cov=pandas --cov-report xml:/tmp/cov.xml --junitxml=/tmp/single .xml $TEST_ARGS pandas
2525else
26- echo pytest -m " single" $TEST_ARGS pandas
27- pytest -m " single" $TEST_ARGS pandas # TODO: doctest
26+ echo pytest -m " single" --junitxml=/tmp/single.xml $TEST_ARGS pandas
27+ pytest -m " single" --junitxml=/tmp/single.xml $TEST_ARGS pandas # TODO: doctest
2828fi
2929
3030RET=" $? "
You can’t perform that action at this time.
0 commit comments