From bac09668143f47425bbf296a2b212cba07d59667 Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Fri, 4 Mar 2016 12:32:50 -0300 Subject: [PATCH] Replace instances of envvar TRAVIS with CI --- Makefile | 6 +++--- tests/conftest.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4596864..89b7cb5 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ export REMOTESTORAGE_SERVER := skip export RADICALE_BACKEND := filesystem export REQUIREMENTS := release export TESTSERVER_BASE := ./tests/storage/servers/ -export TRAVIS := false +export CI := false export DETERMINISTIC_TESTS := false install-servers: @@ -28,11 +28,11 @@ install-test: install-servers git+https://github.com/DRMacIver/hypothesis \ git+https://github.com/pytest-dev/pytest; \ fi - [ $(TRAVIS) != "true" ] || pip install coverage codecov + [ $(CI) != "true" ] || pip install coverage codecov test: set -e; \ - if [ "$(TRAVIS)" = "true" ]; then \ + if [ "$(CI)" = "true" ]; then \ coverage run --source=vdirsyncer/ --module pytest; \ codecov; \ else \ diff --git a/tests/conftest.py b/tests/conftest.py index 2268df9..e9de77a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -41,5 +41,5 @@ settings.register_profile("deterministic", settings( if os.getenv('DETERMINISTIC_TESTS').lower == 'true': settings.load_profile("deterministic") -elif os.getenv('TRAVIS').lower == 'true': +elif os.getenv('CI').lower == 'true': settings.load_profile("ci")