|
26 | 26 | ) |
27 | 27 | from kazoo.protocol.connection import _CONNECTION_DROP |
28 | 28 | from kazoo.protocol.states import KeeperState, KazooState |
29 | | -from kazoo.tests.util import TRAVIS_ZK_VERSION |
| 29 | +from kazoo.tests.util import CI_ZK_VERSION |
30 | 30 |
|
31 | 31 |
|
32 | 32 | if sys.version_info > (3, ): # pragma: nocover |
@@ -605,8 +605,8 @@ def test_create_acl_duplicate(self): |
605 | 605 | client.create("/1", acl=[single_acl, single_acl]) |
606 | 606 | acls, stat = client.get_acls("/1") |
607 | 607 | # ZK >3.4 removes duplicate ACL entries |
608 | | - if TRAVIS_ZK_VERSION: |
609 | | - version = TRAVIS_ZK_VERSION |
| 608 | + if CI_ZK_VERSION: |
| 609 | + version = CI_ZK_VERSION |
610 | 610 | else: |
611 | 611 | version = client.server_version() |
612 | 612 | assert len(acls) == 1 if version > (3, 4) else 2 |
@@ -718,8 +718,8 @@ def test_create_exists(self): |
718 | 718 | client.create(path) |
719 | 719 |
|
720 | 720 | def test_create_stat(self): |
721 | | - if TRAVIS_ZK_VERSION: |
722 | | - version = TRAVIS_ZK_VERSION |
| 721 | + if CI_ZK_VERSION: |
| 722 | + version = CI_ZK_VERSION |
723 | 723 | else: |
724 | 724 | version = self.client.server_version() |
725 | 725 | if not version or version < (3, 5): |
@@ -1176,9 +1176,9 @@ class TestClientTransactions(KazooTestCase): |
1176 | 1176 | def setUp(self): |
1177 | 1177 | KazooTestCase.setUp(self) |
1178 | 1178 | skip = False |
1179 | | - if TRAVIS_ZK_VERSION and TRAVIS_ZK_VERSION < (3, 4): |
| 1179 | + if CI_ZK_VERSION and CI_ZK_VERSION < (3, 4): |
1180 | 1180 | skip = True |
1181 | | - elif TRAVIS_ZK_VERSION and TRAVIS_ZK_VERSION >= (3, 4): |
| 1181 | + elif CI_ZK_VERSION and CI_ZK_VERSION >= (3, 4): |
1182 | 1182 | skip = False |
1183 | 1183 | else: |
1184 | 1184 | ver = self.client.server_version() |
@@ -1378,8 +1378,8 @@ class TestReconfig(KazooTestCase): |
1378 | 1378 | def setUp(self): |
1379 | 1379 | KazooTestCase.setUp(self) |
1380 | 1380 |
|
1381 | | - if TRAVIS_ZK_VERSION: |
1382 | | - version = TRAVIS_ZK_VERSION |
| 1381 | + if CI_ZK_VERSION: |
| 1382 | + version = CI_ZK_VERSION |
1383 | 1383 | else: |
1384 | 1384 | version = self.client.server_version() |
1385 | 1385 | if not version or version < (3, 5): |
|
0 commit comments