From e9ac0367bef3914a85dc359c4af362b5ea984089 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Tue, 19 Mar 2013 11:17:01 +0000
Subject: [PATCH] disable doozer/zk tests using environment variables
---
configdb/tests/db_api_test_base.py | 2 +-
configdb/tests/test_db_api_doozer.py | 4 +++-
configdb/tests/test_db_api_zookeeper.py | 4 +++-
configdb/tests/test_doozer_interface.py | 4 +++-
configdb/tests/test_zookeeper_interface.py | 4 +++-
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/configdb/tests/db_api_test_base.py b/configdb/tests/db_api_test_base.py
index 9764d6a..2daa8a5 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 815b05f..e532b80 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 1af2734..5fb4b57 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 27cdbad..86b6ffa 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 28cba68..3e3b4f2 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 *
--
GitLab