Merge lp:~zulcss/ceilometer/ceilomter-ftbfs into lp:~openstack-ubuntu-testing/ceilometer/havana

[Chuck Short]

fixes ftbfs and run tests per commit

Unmerged revisions

28. By Chuck Short on 2013-05-07

* New upstream release.
* debian/patches/requests-dep.patch: Dropped no longer needed.
* debian/patches/default-dbconnection-sqlite.patch: Refreshed.
* debian/patches/fix-ubuntu-tests.patch: Skip tests for databases
  that we dont do yet. (hbase)
* debian/rules: FTBS if the package tests fail.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-05 19:34:40 +0000
+++ debian/changelog	2013-05-07 00:52:58 +0000
@@ -1,3 +1,14 @@
+ceilometer (2013.2.a82.g1667ded-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches/requests-dep.patch: Dropped no longer needed.
+  * debian/patches/default-dbconnection-sqlite.patch: Refreshed.
+  * debian/patches/fix-ubuntu-tests.patch: Skip tests for databases
+    that we dont do yet. (hbase)
+  * debian/rules: FTBS if the package tests fail.
+
+ -- Chuck Short <[e-mail]>  Mon, 06 May 2013 18:49:37 -0500
+
 ceilometer (2013.1-0ubuntu1) raring; urgency=low
 
   * New upstream release. 
 
=== modified file 'debian/patches/default-dbconnection-sqlite.patch'
--- debian/patches/default-dbconnection-sqlite.patch	2013-03-21 16:49:24 +0000
+++ debian/patches/default-dbconnection-sqlite.patch	2013-05-07 00:52:58 +0000
@@ -1,11 +1,11 @@
---- a/etc/ceilometer/ceilometer.conf.sample
-+++ b/etc/ceilometer/ceilometer.conf.sample
-@@ -262,7 +262,7 @@
- 
- ######## defined in ceilometer.storage ########
- 
--# database_connection=mongodb://localhost:27017/ceilometer
+diff -Naurp ceilometer-2013.2.a82.g1667ded.orig/etc/ceilometer/ceilometer.conf.sample ceilometer-2013.2.a82.g1667ded/etc/ceilometer/ceilometer.conf.sample
+--- ceilometer-2013.2.a82.g1667ded.orig/etc/ceilometer/ceilometer.conf.sample	2013-05-06 18:41:53.000000000 -0500
++++ ceilometer-2013.2.a82.g1667ded/etc/ceilometer/ceilometer.conf.sample	2013-05-06 19:00:42.281951315 -0500
+@@ -415,6 +415,7 @@
+ 
+ # Database connection string (string value)
+ #database_connection=mongodb://localhost:27017/ceilometer
 +database_connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite
- #### (StrOpt) Database connection string
- 
- 
+ 
+ 
+ ######## defined in ceilometer.storage.sqlalchemy.models ########
 
=== added file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2013-05-07 00:52:58 +0000
@@ -0,0 +1,15 @@
+diff -Naurp ceilometer-2013.2.a82.g1667ded.orig/ceilometer/tests/db.py ceilometer-2013.2.a82.g1667ded/ceilometer/tests/db.py
+--- ceilometer-2013.2.a82.g1667ded.orig/ceilometer/tests/db.py	2013-05-06 18:41:53.000000000 -0500
++++ ceilometer-2013.2.a82.g1667ded/ceilometer/tests/db.py	2013-05-06 19:28:30.865952124 -0500
+@@ -41,6 +41,10 @@ class TestBase(test_base.TestCase):
+     def setUp(self):
+         super(TestBase, self).setUp()
+         cfg.CONF.database_connection = self.database_connection
+-        self.conn = storage.get_connection(cfg.CONF)
++        try:
++            self.conn = storage.get_connection(cfg.CONF)
++        except RuntimeError:
++            import nose
++            raise nose.SkipTest("Unable to connect to database")
+         self.conn.upgrade()
+         self.conn.clear()
 
=== removed file 'debian/patches/requests-dep.patch'
--- debian/patches/requests-dep.patch	2013-03-21 16:49:24 +0000
+++ debian/patches/requests-dep.patch	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Description: Remove upper bound on requests
-Author: James Page <[e-mail]>
-Forwarded: no
-
---- a/tools/pip-requires
-+++ b/tools/pip-requires
-@@ -15,7 +15,7 @@ python-novaclient>=2.6.10
- python-keystoneclient>=0.2.3
- python-swiftclient
- lxml
--requests<1.0
-+requests
- extras
- wsme>=0.5b1
- pyyaml
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-03-12 15:01:59 +0000
+++ debian/patches/series	2013-05-07 00:52:58 +0000
@@ -1,3 +1,3 @@
 remove-hbase-support.patch
-requests-dep.patch
 default-dbconnection-sqlite.patch
+fix-ubuntu-tests.patch
 
=== modified file 'debian/rules'
--- debian/rules	2013-03-11 22:42:51 +0000
+++ debian/rules	2013-05-07 00:52:58 +0000
@@ -14,7 +14,7 @@
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
 	mkdir -p ${HOME}
-	PYTHONPATH=$(CURDIR) nosetests || true
+	PYTHONPATH=$(CURDIR) nosetests
 endif
 
 override_dh_install: