From 13af5ffbafe159adedfb867a5cb97dfa77a55c2d Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Fri, 4 Mar 2016 14:15:23 +0100 Subject: [PATCH] Replace CI with TRAVIS --- Makefile | 1 - tests/conftest.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6692248..4596864 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,6 @@ 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: diff --git a/tests/conftest.py b/tests/conftest.py index e9de77a..2268df9 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('CI').lower == 'true': +elif os.getenv('TRAVIS').lower == 'true': settings.load_profile("ci")