Merge "Fix dbsync API change"

bin/ceilometer-dbsync

@@ -25,4 +25,4 @@ from ceilometer.openstack.common import cfg
 
 if __name__ == '__main__':
     service.prepare_service(sys.argv)
-    storage.get_connection(cfg.CONF).db_sync()
+    storage.get_connection(cfg.CONF).upgrade()

tests/test_bin.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+#
+# Copyright © 2012 eNovance <licensing@enovance.com>
+#
+# Author: Julien Danjou <julien@danjou.info>
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import subprocess
+import unittest
+
+
+class BinDbsyncTestCase(unittest.TestCase):
+    def test_dbsync_run(self):
+        subp = subprocess.Popen(["../bin/ceilometer-dbsync",
+                                "--database_connection=log://localhost"])
+        self.assertEqual(subp.wait(), 0)