Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
9574dac
TST: Call tests just once with --dist=loadscope
Sep 19, 2019
f772aa1
Remove code that was left by mistake
Sep 19, 2019
c527e55
Merge remote-tracking branch 'upstream/master' into remove_tests_mult…
Sep 20, 2019
490e0b7
Replacing loadscope by loadfile
Sep 20, 2019
f93999a
Merge remote-tracking branch 'upstream/master' into remove_tests_mult…
datapythonista Oct 1, 2019
a7fdb62
Merge remote-tracking branch 'upstream/master' into remove_tests_mult…
datapythonista Oct 1, 2019
432b352
Empty commit to rerun CI
datapythonista Oct 2, 2019
ff5148e
Merging from master
datapythonista Oct 4, 2019
5c7575a
Pinning pytest-xdist
datapythonista Oct 4, 2019
1055fc7
Merge remote-tracking branch 'upstream/master' into remove_tests_mult…
datapythonista Oct 12, 2019
5d49eba
Merge remote-tracking branch 'upstream/master' into remove_tests_mult…
datapythonista Oct 20, 2019
fba470b
Adding xvfb
datapythonista Oct 20, 2019
09618aa
Merging from master
datapythonista Nov 14, 2019
b848799
Printing errors for xvfb-run
datapythonista Nov 14, 2019
8823919
Not failing if xvfb is already running
datapythonista Nov 14, 2019
699d7d9
Removing xvfb
datapythonista Nov 14, 2019
a8f15c3
Running xvfb only in travis
datapythonista Nov 14, 2019
0c54fa0
Adding error information for xvfb
datapythonista Nov 14, 2019
73934b6
Only run xvfb when DISPLAY is not defined
datapythonista Nov 14, 2019
9972e4d
Merge remote-tracking branch 'upstream/master' into remove_tests_mult…
datapythonista Nov 14, 2019
a27609d
Clarifying comment
datapythonista Nov 14, 2019
2e79f38
Removing xvfb in Travis config
datapythonista Nov 16, 2019
bff544b
Merge remote-tracking branch 'upstream/master' into remove_tests_mult…
datapythonista Nov 16, 2019
a4b1397
Merge remote-tracking branch 'upstream/master' into remove_tests_mult…
datapythonista Nov 16, 2019
5750713
Merge remote-tracking branch 'upstream/master' into remove_tests_mult…
datapythonista Nov 16, 2019
bd100ac
Merge remote-tracking branch 'upstream/master' into remove_tests_mult…
datapythonista Nov 17, 2019
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
Prev Previous commit
Next Next commit
Clarifying comment
  • Loading branch information
datapythonista committed Nov 14, 2019
commit a27609dab646ef5c23e93b510faff4c382c1df67
2 changes: 1 addition & 1 deletion ci/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fi

PYTEST_CMD="pytest -m \"$PATTERN\" -n auto --dist=loadfile -s --strict --durations=10 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas"

# Travis does not have xvfb active
# Travis may not have xvfb active
if [[ "$TRAVIS_OS_NAME" == "linux" && -z "$DISPLAY" ]]; then
DISPLAY=DISPLAY=:99.0
PYTEST_CMD="xvfb-run -e /dev/stdout $PYTEST_CMD"
Expand Down