diff --git a/configdb/tests/db_api_test_base.py b/configdb/tests/db_api_test_base.py index 9764d6a0b663c63ce5a1f67405069f89206c5dc1..2daa8a5ab7af706bd1b9dc14dfd468b09fb5ad5b 100644 --- a/configdb/tests/db_api_test_base.py +++ b/configdb/tests/db_api_test_base.py @@ -359,4 +359,4 @@ class DbApiTestBase(object): self.assertTrue(ts2 > ts1) def test_timestamp_for_non_updated_entity(self): - self.assertRaises(ValueError, self.api.get_timestamp,'role',self.ctx) + self.assertRaises(ValueError, self.api.get_timestamp, 'role', self.ctx) diff --git a/configdb/tests/test_db_api_doozer.py b/configdb/tests/test_db_api_doozer.py index 815b05fcbf7116c9cb8f48d7d297c923c9121f6e..e532b80b87fd74eb80053de1ca2e10f0a8a98ab1 100644 --- a/configdb/tests/test_db_api_doozer.py +++ b/configdb/tests/test_db_api_doozer.py @@ -1,9 +1,11 @@ import os +from nose.exc import SkipTest try: import doozer from doozer.client import IsDirectory, NoEntity + if os.getenv('SKIP_DOOZER') is not None: + raise SkipTest('doozer tests disabled') except ImportError: - from nose.exc import SkipTest raise SkipTest('doozer not found') from configdb.db.interface import doozer_interface diff --git a/configdb/tests/test_db_api_zookeeper.py b/configdb/tests/test_db_api_zookeeper.py index 1af27346423663b996994260323f1f0251080a53..5fb4b57a75e8018035f11d8495ebc992164868ad 100644 --- a/configdb/tests/test_db_api_zookeeper.py +++ b/configdb/tests/test_db_api_zookeeper.py @@ -1,8 +1,10 @@ import os +from nose.exc import SkipTest try: from configdb.db.interface import zookeeper_interface + if os.getenv('SKIP_ZOOKEEPER') is not None: + raise SkipTest('Zookeeper tests disabled') except ImportError: - from nose.exc import SkipTest raise SkipTest('Zookeeper not found') from configdb.tests import * diff --git a/configdb/tests/test_doozer_interface.py b/configdb/tests/test_doozer_interface.py index 27cdbad10f59c6867ca3de54a1c2d668406e98e9..86b6ffa0384128c77863dcba41ab34f6fb40e408 100644 --- a/configdb/tests/test_doozer_interface.py +++ b/configdb/tests/test_doozer_interface.py @@ -1,9 +1,11 @@ import os +from nose.exc import SkipTest try: import doozer from doozer.client import IsDirectory, NoEntity + if os.getenv('SKIP_DOOZER') is not None: + raise SkipTest('doozer tests disabled') except ImportError: - from nose.exc import SkipTest raise SkipTest('doozer not found') from configdb.db.interface import doozer_interface diff --git a/configdb/tests/test_zookeeper_interface.py b/configdb/tests/test_zookeeper_interface.py index 28cba6882fd62e0c730c8598468aba9de4e28be6..3e3b4f2ab6e08eac172bec1da7cc83d0378e5403 100644 --- a/configdb/tests/test_zookeeper_interface.py +++ b/configdb/tests/test_zookeeper_interface.py @@ -1,8 +1,10 @@ import os +from nose.exc import SkipTest try: from configdb.db.interface import zookeeper_interface + if os.getenv('SKIP_ZOOKEEPER') is not None: + raise SkipTest('Zookeeper tests disabled') except ImportError: - from nose.exc import SkipTest raise SkipTest('Zookeeper not found') from configdb.tests import *