summaryrefslogtreecommitdiff
path: root/kazoo/tests
diff options
context:
space:
mode:
Diffstat (limited to 'kazoo/tests')
-rw-r--r--kazoo/tests/test_build.py4
-rw-r--r--kazoo/tests/test_client.py18
-rw-r--r--kazoo/tests/test_connection.py6
-rw-r--r--kazoo/tests/test_queue.py6
-rw-r--r--kazoo/tests/test_sasl.py14
-rw-r--r--kazoo/tests/util.py12
6 files changed, 30 insertions, 30 deletions
diff --git a/kazoo/tests/test_build.py b/kazoo/tests/test_build.py
index 253027f..687c1dc 100644
--- a/kazoo/tests/test_build.py
+++ b/kazoo/tests/test_build.py
@@ -8,8 +8,8 @@ from kazoo.testing import KazooTestCase
class TestBuildEnvironment(KazooTestCase):
def setUp(self):
KazooTestCase.setUp(self)
- if not os.environ.get('TRAVIS'):
- pytest.skip('Only run build config tests on Travis.')
+ if not os.environ.get('CI'):
+ pytest.skip('Only run build config tests on CI.')
def test_zookeeper_version(self):
server_version = self.client.server_version()
diff --git a/kazoo/tests/test_client.py b/kazoo/tests/test_client.py
index 45ec009..a0f1abd 100644
--- a/kazoo/tests/test_client.py
+++ b/kazoo/tests/test_client.py
@@ -26,7 +26,7 @@ from kazoo.exceptions import (
)
from kazoo.protocol.connection import _CONNECTION_DROP
from kazoo.protocol.states import KeeperState, KazooState
-from kazoo.tests.util import TRAVIS_ZK_VERSION
+from kazoo.tests.util import CI_ZK_VERSION
if sys.version_info > (3, ): # pragma: nocover
@@ -605,8 +605,8 @@ class TestClient(KazooTestCase):
client.create("/1", acl=[single_acl, single_acl])
acls, stat = client.get_acls("/1")
# ZK >3.4 removes duplicate ACL entries
- if TRAVIS_ZK_VERSION:
- version = TRAVIS_ZK_VERSION
+ if CI_ZK_VERSION:
+ version = CI_ZK_VERSION
else:
version = client.server_version()
assert len(acls) == 1 if version > (3, 4) else 2
@@ -718,8 +718,8 @@ class TestClient(KazooTestCase):
client.create(path)
def test_create_stat(self):
- if TRAVIS_ZK_VERSION:
- version = TRAVIS_ZK_VERSION
+ if CI_ZK_VERSION:
+ version = CI_ZK_VERSION
else:
version = self.client.server_version()
if not version or version < (3, 5):
@@ -1176,9 +1176,9 @@ class TestClientTransactions(KazooTestCase):
def setUp(self):
KazooTestCase.setUp(self)
skip = False
- if TRAVIS_ZK_VERSION and TRAVIS_ZK_VERSION < (3, 4):
+ if CI_ZK_VERSION and CI_ZK_VERSION < (3, 4):
skip = True
- elif TRAVIS_ZK_VERSION and TRAVIS_ZK_VERSION >= (3, 4):
+ elif CI_ZK_VERSION and CI_ZK_VERSION >= (3, 4):
skip = False
else:
ver = self.client.server_version()
@@ -1378,8 +1378,8 @@ class TestReconfig(KazooTestCase):
def setUp(self):
KazooTestCase.setUp(self)
- if TRAVIS_ZK_VERSION:
- version = TRAVIS_ZK_VERSION
+ if CI_ZK_VERSION:
+ version = CI_ZK_VERSION
else:
version = self.client.server_version()
if not version or version < (3, 5):
diff --git a/kazoo/tests/test_connection.py b/kazoo/tests/test_connection.py
index 411d2d0..d62f7f7 100644
--- a/kazoo/tests/test_connection.py
+++ b/kazoo/tests/test_connection.py
@@ -19,7 +19,7 @@ from kazoo.protocol.states import KazooState
from kazoo.protocol.connection import _CONNECTION_DROP
from kazoo.testing import KazooTestCase
from kazoo.tests.util import wait
-from kazoo.tests.util import TRAVIS_ZK_VERSION
+from kazoo.tests.util import CI_ZK_VERSION
class Delete(namedtuple('Delete', 'path version')):
@@ -259,9 +259,9 @@ class TestReadOnlyMode(KazooTestCase):
def setUp(self):
self.setup_zookeeper(read_only=True)
skip = False
- if TRAVIS_ZK_VERSION and TRAVIS_ZK_VERSION < (3, 4):
+ if CI_ZK_VERSION and CI_ZK_VERSION < (3, 4):
skip = True
- elif TRAVIS_ZK_VERSION and TRAVIS_ZK_VERSION >= (3, 4):
+ elif CI_ZK_VERSION and CI_ZK_VERSION >= (3, 4):
skip = False
else:
ver = self.client.server_version()
diff --git a/kazoo/tests/test_queue.py b/kazoo/tests/test_queue.py
index 59ece16..b4b8455 100644
--- a/kazoo/tests/test_queue.py
+++ b/kazoo/tests/test_queue.py
@@ -3,7 +3,7 @@ import uuid
import pytest
from kazoo.testing import KazooTestCase
-from kazoo.tests.util import TRAVIS_ZK_VERSION
+from kazoo.tests.util import CI_ZK_VERSION
class KazooQueueTests(KazooTestCase):
@@ -59,9 +59,9 @@ class KazooLockingQueueTests(KazooTestCase):
def setUp(self):
KazooTestCase.setUp(self)
skip = False
- if TRAVIS_ZK_VERSION and TRAVIS_ZK_VERSION < (3, 4):
+ if CI_ZK_VERSION and CI_ZK_VERSION < (3, 4):
skip = True
- elif TRAVIS_ZK_VERSION and TRAVIS_ZK_VERSION >= (3, 4):
+ elif CI_ZK_VERSION and CI_ZK_VERSION >= (3, 4):
skip = False
else:
ver = self.client.server_version()
diff --git a/kazoo/tests/test_sasl.py b/kazoo/tests/test_sasl.py
index efdf965..2ee7120 100644
--- a/kazoo/tests/test_sasl.py
+++ b/kazoo/tests/test_sasl.py
@@ -9,7 +9,7 @@ from kazoo.exceptions import (
AuthFailedError,
NoAuthError,
)
-from kazoo.tests.util import TRAVIS_ZK_VERSION
+from kazoo.tests.util import CI_ZK_VERSION
class TestLegacySASLDigestAuthentication(KazooTestHarness):
@@ -22,8 +22,8 @@ class TestLegacySASLDigestAuthentication(KazooTestHarness):
os.environ["ZOOKEEPER_JAAS_AUTH"] = "digest"
self.setup_zookeeper()
- if TRAVIS_ZK_VERSION:
- version = TRAVIS_ZK_VERSION
+ if CI_ZK_VERSION:
+ version = CI_ZK_VERSION
else:
version = self.client.server_version()
if not version or version < (3, 4):
@@ -71,8 +71,8 @@ class TestSASLDigestAuthentication(KazooTestHarness):
os.environ["ZOOKEEPER_JAAS_AUTH"] = "digest"
self.setup_zookeeper()
- if TRAVIS_ZK_VERSION:
- version = TRAVIS_ZK_VERSION
+ if CI_ZK_VERSION:
+ version = CI_ZK_VERSION
else:
version = self.client.server_version()
if not version or version < (3, 4):
@@ -136,8 +136,8 @@ class TestSASLGSSAPIAuthentication(KazooTestHarness):
os.environ["ZOOKEEPER_JAAS_AUTH"] = "gssapi"
self.setup_zookeeper()
- if TRAVIS_ZK_VERSION:
- version = TRAVIS_ZK_VERSION
+ if CI_ZK_VERSION:
+ version = CI_ZK_VERSION
else:
version = self.client.server_version()
if not version or version < (3, 4):
diff --git a/kazoo/tests/util.py b/kazoo/tests/util.py
index ffbc754..dbe3b48 100644
--- a/kazoo/tests/util.py
+++ b/kazoo/tests/util.py
@@ -16,13 +16,13 @@ import logging
import os
import time
-TRAVIS = os.environ.get('TRAVIS', False)
-TRAVIS_ZK_VERSION = TRAVIS and os.environ.get('ZOOKEEPER_VERSION', None)
-if TRAVIS_ZK_VERSION:
- if '-' in TRAVIS_ZK_VERSION:
+CI = os.environ.get('CI', False)
+CI_ZK_VERSION = CI and os.environ.get('ZOOKEEPER_VERSION', None)
+if CI_ZK_VERSION:
+ if '-' in CI_ZK_VERSION:
# Ignore pre-release markers like -alpha
- TRAVIS_ZK_VERSION = TRAVIS_ZK_VERSION.split('-')[0]
- TRAVIS_ZK_VERSION = tuple([int(n) for n in TRAVIS_ZK_VERSION.split('.')])
+ CI_ZK_VERSION = CI_ZK_VERSION.split('-')[0]
+ CI_ZK_VERSION = tuple([int(n) for n in CI_ZK_VERSION.split('.')])
class Handler(logging.Handler):
View Lorry Controller Status