Merge branch 'test_travis_config'

.travis.yml

@@ -55,7 +55,6 @@ jobs:
       if: not ((branch = master OR tag IS present) AND type != pull_request)
       stage: offline tests
       script: scripts/travis-offline
-      env: PYTEST_ADDOPTS='-m offline'
 
     # Run offline tests in all the supported python versions
       python: 2.7

scripts/travis-offline

@@ -2,8 +2,4 @@
 
 set -ex
 
-echo travis_fold:start:pytest
-
-python -m pytest -m offline
-
-echo travis_fold:end:pytest
+python -m pytest -m offline --color=yes

scripts/travis-online

@@ -2,11 +2,7 @@
 
 set -ex
 
-echo travis_fold:start:pytest
-
 if ! python -m pytest --tb=no --color=yes; then # --tb=no -> Don't print stack traces
     echo 'Some tests failed. Rerunning them, since they can be kinda flaky.'
     python -m pytest --last-failed --color=yes
 fi
-
-echo travis_fold:end:pytest