Skip to content

Commit d6adeec

Browse files
jrebackAnkurDedania
authored andcommitted
TST: print skipped tests files
xref pandas-dev#15341 Author: Jeff Reback <[email protected]> Closes pandas-dev#15408 from jreback/skip and squashes the following commits: 547bee6 [Jeff Reback] TST: print skipped tests files
1 parent 49f0c75 commit d6adeec

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff 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"

ci/install_travis.sh

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ fi
112112
source activate pandas
113113

114114
pip install pytest-xdist
115+
115116
if [ "$LINT" ]; then
116117
conda install flake8
117118
pip install cpplint

ci/print_skipped.py

+4-3
Original file line numberDiff line numberDiff 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

3737
def 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

4344
def 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

ci/script_multi.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ fi
2020
if [ "$BUILD_TEST" ]; then
2121
echo "We are not running pytest as this is simply a build test."
2222
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
2525
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
2828
fi
2929

3030
RET="$?"

ci/script_single.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ fi
2020
if [ "$BUILD_TEST" ]; then
2121
echo "We are not running pytest as this is simply a build test."
2222
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
2525
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
2828
fi
2929

3030
RET="$?"

0 commit comments

Comments
 (0)