X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fpatches%2Fskip-db-tests.patch;fp=trusty%2Fdebian%2Fpatches%2Fskip-db-tests.patch;h=0000000000000000000000000000000000000000;hb=378bac3ef6a5faf59b1722d186df3db8c01c13d3;hp=1e6816ac20e7af2b0a2414ae2da5464fa51b110f;hpb=981587dac7b7711ee52a4fc6b8589ad23db4c59b;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/patches/skip-db-tests.patch b/trusty/debian/patches/skip-db-tests.patch
deleted file mode 100644
index 1e6816a..0000000
--- a/trusty/debian/patches/skip-db-tests.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d008622c43dc902e1bb73ea5ff08beb8ec48f7d9 Mon Sep 17 00:00:00 2001
-From: Chuck Short <chuck.short@canonical.com>
-Date: Fri, 21 Nov 2014 11:30:23 -0600
-Subject: [PATCH] skip-db
-
-Signed-off-by: Chuck Short <chuck.short@canonical.com>
----
- ceilometer/tests/db.py | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py
-index f29d4fe..8c09115 100644
---- a/ceilometer/tests/db.py
-+++ b/ceilometer/tests/db.py
-@@ -268,13 +268,13 @@ class MixinTestsWithBackendScenarios(object):
-     scenarios_db = [db for db, _ in scenarios]
- 
-     # Insert default value for hbase test
--    if 'hbase' not in scenarios_db:
--        scenarios.append(
--            ('hbase', {'db_url': 'hbase://__test__'}))
-+    #if 'hbase' not in scenarios_db:
-+    #    scenarios.append(
-+    #        ('hbase', {'db_url': 'hbase://__test__'}))
- 
-     # Insert default value for db2 test
--    if 'mongodb' in scenarios_db and 'db2' not in scenarios_db:
--        scenarios.append(
--            ('db2', {'db_url': os.environ.get('CEILOMETER_TEST_MONGODB_URL',
--                                              '').replace('mongodb://',
--                                                          'db2://')}))
-+    #if 'mongodb' in scenarios_db and 'db2' not in scenarios_db:
-+    #    scenarios.append(
-+    #        ('db2', {'db_url': os.environ.get('CEILOMETER_TEST_MONGODB_URL',
-+     #                                         '').replace('mongodb://',
-+     #                                                     'db2://')}))
--- 
-2.1.0
-