Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -332,5 +332,6 @@ after_script:
- echo "after_script start"
- ci/install_test.sh
- source activate pandas && python -c "import pandas; pandas.show_versions();"
- ci/print_skipped.py /tmp/pytest.xml
- ci/print_skipped.py /tmp/single.xml
- ci/print_skipped.py /tmp/multiple.xml
- echo "after_script done"
1 change: 1 addition & 0 deletions ci/install_travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ fi
source activate pandas

pip install pytest-xdist

if [ "$LINT" ]; then
conda install flake8
pip install cpplint
Expand Down
7 changes: 4 additions & 3 deletions ci/print_skipped.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,21 @@ def parse_results(filename):
i += 1
assert i - 1 == len(skipped)
assert i - 1 == len(skipped)
assert len(skipped) == int(root.attrib['skip'])
# assert len(skipped) == int(root.attrib['skip'])
return '\n'.join(skipped)


def main(args):
print('SKIPPED TESTS:')
print(parse_results(args.filename))
for fn in args.filename:
print(parse_results(fn))
return 0


def parse_args():
import argparse
parser = argparse.ArgumentParser()
parser.add_argument('filename', help='XUnit file to parse')
parser.add_argument('filename', nargs='+', help='XUnit file to parse')
return parser.parse_args()


Expand Down
8 changes: 4 additions & 4 deletions ci/script_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ fi
if [ "$BUILD_TEST" ]; then
echo "We are not running pytest as this is simply a build test."
elif [ "$COVERAGE" ]; then
echo pytest -s -n 2 -m "not single" --cov=pandas --cov-append --cov-report xml:/tmp/pytest.xml $TEST_ARGS pandas
pytest -s -n 2 -m "not single" --cov=pandas --cov-append --cov-report xml:/tmp/pytest.xml $TEST_ARGS pandas
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
pytest -s -n 2 -m "not single" --cov=pandas --cov-append --cov-report xml:/tmp/cov.xml --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
else
echo pytest -n 2 -m "not single" $TEST_ARGS pandas
pytest -n 2 -m "not single" $TEST_ARGS pandas # TODO: doctest
echo pytest -n 2 -m "not single" --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
pytest -n 2 -m "not single" --junitxml=/tmp/multiple.xml $TEST_ARGS pandas # TODO: doctest
fi

RET="$?"
Expand Down
8 changes: 4 additions & 4 deletions ci/script_single.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ fi
if [ "$BUILD_TEST" ]; then
echo "We are not running pytest as this is simply a build test."
elif [ "$COVERAGE" ]; then
echo pytest -s -m "single" --cov=pandas --cov-report xml:/tmp/pytest.xml $TEST_ARGS pandas
pytest -s -m "single" --cov=pandas --cov-report xml:/tmp/pytest.xml $TEST_ARGS pandas
echo pytest -s -m "single" --cov=pandas --cov-report xml:/tmp/cov.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
pytest -s -m "single" --cov=pandas --cov-report xml:/tmp/cov.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
else
echo pytest -m "single" $TEST_ARGS pandas
pytest -m "single" $TEST_ARGS pandas # TODO: doctest
echo pytest -m "single" --junitxml=/tmp/single.xml $TEST_ARGS pandas
pytest -m "single" --junitxml=/tmp/single.xml $TEST_ARGS pandas # TODO: doctest
fi

RET="$?"
Expand Down