@@ -15,37 +15,29 @@ if [ -n "$LOCALE_OVERRIDE" ]; then
15
15
# exit 1
16
16
fi
17
17
fi
18
+
18
19
if [[ " not network" == * " $PATTERN " * ]]; then
19
20
export http_proxy=http://1.2.3.4 https_proxy=http://1.2.3.4;
20
21
fi
21
22
22
-
23
- if [ -n " $PATTERN " ] ; then
24
- PATTERN= " and $PATTERN "
23
+ if [ " $COVERAGE " ] ; then
24
+ COVERAGE_FNAME= " /tmp/test_coverage.xml "
25
+ COVERAGE= " -s --cov=pandas --cov-report=xml: $COVERAGE_FNAME "
25
26
fi
26
27
27
- for TYPE in single multiple
28
- do
29
- if [ " $COVERAGE " ]; then
30
- COVERAGE_FNAME=" /tmp/coc-$TYPE .xml"
31
- COVERAGE=" -s --cov=pandas --cov-report=xml:$COVERAGE_FNAME "
32
- fi
28
+ PYTEST_CMD=" pytest -m \" $PATTERN \" -n auto --dist=loadfile -s --strict --durations=10 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas"
33
29
34
- TYPE_PATTERN=$TYPE
35
- NUM_JOBS=1
36
- if [[ " $TYPE_PATTERN " == " multiple" ]]; then
37
- TYPE_PATTERN=" not single"
38
- NUM_JOBS=2
39
- fi
30
+ # Travis does not have have an X server
31
+ if [[ " $TRAVIS_OS_NAME " == " linux" ]]; then
32
+ DISPLAY=DISPLAY=:99.0
33
+ PYTEST_CMD=" xvfb-run -e /dev/stdout $PYTEST_CMD "
34
+ fi
40
35
41
- PYTEST_CMD=" pytest -m \" $TYPE_PATTERN$PATTERN \" -n $NUM_JOBS -s --strict --durations=10 --junitxml=test-data-$TYPE .xml $TEST_ARGS $COVERAGE pandas"
42
- echo $PYTEST_CMD
43
- # if no tests are found (the case of "single and slow"), pytest exits with code 5, and would make the script fail, if not for the below code
44
- sh -c " $PYTEST_CMD ; ret=\$ ?; [ \$ ret = 5 ] && exit 0 || exit \$ ret"
36
+ echo $PYTEST_CMD
37
+ sh -c " $PYTEST_CMD "
45
38
46
- if [[ " $COVERAGE " && $? == 0 && " $TRAVIS_BRANCH " == " master" ]]; then
47
- echo " uploading coverage for $TYPE tests"
48
- echo " bash <(curl -s https://codecov.io/bash) -Z -c -F $TYPE -f $COVERAGE_FNAME "
49
- bash <( curl -s https://codecov.io/bash) -Z -c -F $TYPE -f $COVERAGE_FNAME
50
- fi
51
- done
39
+ if [[ " $COVERAGE " && $? == 0 && " $TRAVIS_BRANCH " == " master" ]]; then
40
+ echo " uploading coverage"
41
+ echo " bash <(curl -s https://codecov.io/bash) -Z -c -F $TYPE -f $COVERAGE_FNAME "
42
+ bash <( curl -s https://codecov.io/bash) -Z -c -F $TYPE -f $COVERAGE_FNAME
43
+ fi
0 commit comments