CI: slightly more robust xfvb starting

Author: jreback

.travis.yml

@@ -51,7 +51,7 @@ matrix:
           - python-gtk2
     - dist: trusty
       env:
-        - JOB="3.5" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true
+        - JOB="3.5" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true CLIPBOARD=true
       addons:
         apt:
           packages:
@@ -74,7 +74,7 @@ matrix:
     # In allow_failures
     - dist: trusty
       env:
-        - JOB="3.6_DOC" DOC=true
+        - JOB="3.6_DOC" DOC=true CLIPBOARD=true
       addons:
         apt:
           packages:
@@ -91,7 +91,7 @@ matrix:
           - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
       - dist: trusty
         env:
-          - JOB="3.6_DOC" DOC=true
+          - JOB="3.6_DOC" DOC=true CLIPBOARD=true
 
 before_install:
   - echo "before_install"
@@ -102,8 +102,6 @@ before_install:
   - uname -a
   - git --version
   - git tag
-  - ci/before_install_travis.sh
-  - export DISPLAY=":99.0"
 
 install:
   - echo "install start"
@@ -114,6 +112,7 @@ install:
 
 before_script:
   - ci/install_db_travis.sh
+  - ci/before_script_travis.sh
 
 script:
   - echo "script start"

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

@@ -2,8 +2,10 @@
 
 echo "inside $0"
 
-if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
+if [ "$CLIPBOARD" ] && [ "${TRAVIS_OS_NAME}" == "linux" ]; then
+   export DISPLAY=":99.0"
    sh -e /etc/init.d/xvfb start
+   sleep 3
 fi
 
 # Never fail because bad things happened here.

ci/script_single.sh

@@ -3,6 +3,7 @@
 echo "[script_single]"
 
 source activate pandas
+export DISPLAY=":99.0"
 
 if [ -n "$LOCALE_OVERRIDE" ]; then
     export LC_ALL="$LOCALE_OVERRIDE";