File tree 5 files changed +15
-12
lines changed
5 files changed +15
-12
lines changed Original file line number Diff line number Diff line change @@ -332,5 +332,6 @@ after_script:
332
332
- echo "after_script start"
333
333
- ci/install_test.sh
334
334
- 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
336
337
- echo "after_script done"
Original file line number Diff line number Diff line change 112
112
source activate pandas
113
113
114
114
pip install pytest-xdist
115
+
115
116
if [ " $LINT " ]; then
116
117
conda install flake8
117
118
pip install cpplint
Original file line number Diff line number Diff line change @@ -30,20 +30,21 @@ def parse_results(filename):
30
30
i += 1
31
31
assert i - 1 == len (skipped )
32
32
assert i - 1 == len (skipped )
33
- assert len (skipped ) == int (root .attrib ['skip' ])
33
+ # assert len(skipped) == int(root.attrib['skip'])
34
34
return '\n ' .join (skipped )
35
35
36
36
37
37
def main (args ):
38
38
print ('SKIPPED TESTS:' )
39
- print (parse_results (args .filename ))
39
+ for fn in args .filename :
40
+ print (parse_results (fn ))
40
41
return 0
41
42
42
43
43
44
def parse_args ():
44
45
import argparse
45
46
parser = argparse .ArgumentParser ()
46
- parser .add_argument ('filename' , help = 'XUnit file to parse' )
47
+ parser .add_argument ('filename' , nargs = '+' , help = 'XUnit file to parse' )
47
48
return parser .parse_args ()
48
49
49
50
Original file line number Diff line number Diff line change 20
20
if [ " $BUILD_TEST " ]; then
21
21
echo " We are not running pytest as this is simply a build test."
22
22
elif [ " $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
25
25
else
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
28
28
fi
29
29
30
30
RET=" $? "
Original file line number Diff line number Diff line change 20
20
if [ " $BUILD_TEST " ]; then
21
21
echo " We are not running pytest as this is simply a build test."
22
22
elif [ " $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
25
25
else
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
28
28
fi
29
29
30
30
RET=" $? "
You can’t perform that action at this time.
0 commit comments