Skip to content

Commit fbe15d0

Browse files
authored
CI: slightly more robust xfvb starting (#18239)
1 parent eb39b44 commit fbe15d0

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ before_install:
102102
- uname -a
103103
- git --version
104104
- git tag
105-
- ci/before_install_travis.sh
106-
- export DISPLAY=":99.0"
107105

108106
install:
109107
- echo "install start"
@@ -114,6 +112,8 @@ install:
114112

115113
before_script:
116114
- ci/install_db_travis.sh
115+
- export DISPLAY=":99.0"
116+
- ci/before_script_travis.sh
117117

118118
script:
119119
- echo "script start"

ci/before_install_travis.sh renamed to ci/before_script_travis.sh

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ echo "inside $0"
44

55
if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
66
sh -e /etc/init.d/xvfb start
7+
sleep 3
78
fi
89

910
# Never fail because bad things happened here.

pandas/tests/io/test_clipboard.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
try:
1919
DataFrame({'A': [1, 2]}).to_clipboard()
2020
_DEPS_INSTALLED = 1
21-
except PyperclipException:
21+
except (PyperclipException, RuntimeError):
2222
_DEPS_INSTALLED = 0
2323

2424

0 commit comments

Comments
 (0)