Merge branch 'master' into autopkgtest

.travis.yml

@@ -23,7 +23,8 @@ install:
     - docker build --tag=britney .
 
 script:
-    - docker run britney /bin/sh -c "export CI=true ; ci/run-everything-and-upload-to-codecov.io.sh"
+    # https://docs.codecov.io/docs/testing-with-docker
+    - ci_env=$(bash <(curl -s https://codecov.io/env)) ; docker run $ci_env britney /bin/sh -c "export CI=true ; ci/run-everything-and-upload-to-codecov.io.sh"
 
 #notifications:
 #  email: false

ci/run-everything-and-upload-to-codecov.io.sh

@@ -10,7 +10,11 @@ echo
 britney2-tests/bin/runtests ./ci/britney-coverage.sh britney2-tests/t test-out || err=$?
 echo
 echo
-britney2-tests/bin/runtests ./britney.py britney2-tests/live-data test-out-live-data-1 live-2011-12-13 || err=$?
+if [ -n "$CI" ] ; then
+    echo skipping live-2011-12-13 to prevent time out on Travis of the whole test suite
+else
+    britney2-tests/bin/runtests ./britney.py britney2-tests/live-data test-out-live-data-1 live-2011-12-13 || err=$?
+fi
 echo
 britney2-tests/bin/runtests ./britney.py britney2-tests/live-data test-out-live-data-2 live-2011-12-20 || err=$?
 echo