X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=debian%2Fpatches%2Fskip-database-tests.patch;fp=debian%2Fpatches%2Fskip-database-tests.patch;h=0000000000000000000000000000000000000000;hb=f118dda94ae3c5573049ece7bdae379113b32008;hp=4d479a8e88668c24fe78dfcc31376020d3682d29;hpb=00988157a804c6b1d310b088d553461bb38c6c14;p=openstack-build%2Fceilometer-build.git diff --git a/debian/patches/skip-database-tests.patch b/debian/patches/skip-database-tests.patch deleted file mode 100644 index 4d479a8..0000000 --- a/debian/patches/skip-database-tests.patch +++ /dev/null @@ -1,468 +0,0 @@ -diff -Naurp ceilometer-2013.2.rc1.orig/ceilometer/tests/db.py ceilometer-2013.2.rc1/ceilometer/tests/db.py ---- ceilometer-2013.2.rc1.orig/ceilometer/tests/db.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/ceilometer/tests/db.py 2013-10-02 18:00:51.237793017 -0400 -@@ -41,8 +41,8 @@ class TestBase(test_base.TestCase): - message='.*you must provide a username and password.*') - try: - self.conn = storage.get_connection(cfg.CONF) -- except storage.StorageBadVersion as e: -- self.skipTest(str(e)) -+ except: -+ self.skipTest('Skipped tests') - self.conn.upgrade() - - def tearDown(self): -@@ -56,9 +56,7 @@ class MongoDBFakeConnectionUrl(object): - def __init__(self): - self.url = os.environ.get('CEILOMETER_TEST_MONGODB_URL') - if not self.url: -- raise RuntimeError( -- "No MongoDB test URL set," -- "export CEILOMETER_TEST_MONGODB_URL environment variable") -+ return - - def __str__(self): - return '%(url)s_%(db)s' % dict(url=self.url, db=uuid.uuid4().hex) -@@ -83,7 +81,4 @@ class MixinTestsWithBackendScenarios(obj - - scenarios = [ - ('sqlalchemy', dict(database_connection='sqlite://')), -- ('mongodb', dict(database_connection=MongoDBFakeConnectionUrl())), -- ('hbase', dict(database_connection='hbase://__test__')), -- ('db2', dict(database_connection=DB2FakeConnectionUrl())), - ] -diff -Naurp ceilometer-2013.2.rc1.orig/tests/agentbase.py ceilometer-2013.2.rc1/tests/agentbase.py ---- ceilometer-2013.2.rc1.orig/tests/agentbase.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/agentbase.py 2013-10-02 18:00:51.237793017 -0400 -@@ -175,7 +175,10 @@ class BaseAgentManagerTestCase(base.Test - self.assertEqual(len(polling_tasks), 1) - self.assertTrue(60 in polling_tasks.keys()) - self.mgr.interval_task(polling_tasks.values()[0]) -- pub = self.mgr.pipeline_manager.pipelines[0].publishers[0] -+ try: -+ pub = self.mgr.pipeline_manager.pipelines[0].publishers[0] -+ except: -+ self.skipTest("Skipped by Ubuntu") - self.assertEqual(pub.samples[0], self.Pollster.test_data) - - def test_setup_polling_tasks_multiple_interval(self): -@@ -244,7 +247,10 @@ class BaseAgentManagerTestCase(base.Test - self.assertEqual(len(polling_tasks.keys()), 1) - polling_tasks.get(10) - self.mgr.interval_task(polling_tasks.get(10)) -- pub = self.mgr.pipeline_manager.pipelines[0].publishers[0] -+ try: -+ pub = self.mgr.pipeline_manager.pipelines[0].publishers[0] -+ except: -+ self.skipTest("Skipped by Ubuntu") - self.assertEqual(len(pub.samples), 0) - - def test_agent_manager_initialize_service_hook(self): -diff -Naurp ceilometer-2013.2.rc1.orig/tests/alarm/test_notifier.py ceilometer-2013.2.rc1/tests/alarm/test_notifier.py ---- ceilometer-2013.2.rc1.orig/tests/alarm/test_notifier.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/alarm/test_notifier.py 2013-10-02 18:00:51.237793017 -0400 -@@ -58,7 +58,10 @@ class TestAlarmNotifier(base.TestCase): - 'reason': 'Everything is on fire', - } - self.service.notify_alarm(context.get_admin_context(), data) -- notifications = self.service.notifiers['test'].obj.notifications -+ try: -+ notifications = self.service.notifiers['test'].obj.notifications -+ except: -+ self.skipTest('Skipped by ubuntu') - self.assertEqual(len(notifications), 1) - self.assertEqual(notifications[0], ( - urlparse.urlsplit(data['actions'][0]), -@@ -90,6 +93,7 @@ class TestAlarmNotifier(base.TestCase): - return notification - - def test_notify_alarm_rest_action_ok(self): -+ self.skipTest('Skipped by Ubuntu') - action = 'http://host/action' - - with mock.patch('eventlet.spawn_n', self._fake_spawn_n): -@@ -102,8 +106,11 @@ class TestAlarmNotifier(base.TestCase): - action = 'https://host/action' - certificate = "/etc/ssl/cert/whatever.pem" - -- cfg.CONF.set_override("rest_notifier_certificate_file", certificate, -- group='alarm') -+ try: -+ cfg.CONF.set_override("rest_notifier_certificate_file", certificate, -+ group='alarm') -+ except: -+ self.skipTest('Skipped by Ubuntu') - - with mock.patch('eventlet.spawn_n', self._fake_spawn_n): - with mock.patch.object(requests, 'post') as poster: -@@ -117,10 +124,13 @@ class TestAlarmNotifier(base.TestCase): - certificate = "/etc/ssl/cert/whatever.pem" - key = "/etc/ssl/cert/whatever.key" - -- cfg.CONF.set_override("rest_notifier_certificate_file", certificate, -- group='alarm') -- cfg.CONF.set_override("rest_notifier_certificate_key", key, -- group='alarm') -+ try: -+ cfg.CONF.set_override("rest_notifier_certificate_file", certificate, -+ group='alarm') -+ cfg.CONF.set_override("rest_notifier_certificate_key", key, -+ group='alarm') -+ except: -+ self.skipTest('Skipped by ubuntu') - - with mock.patch('eventlet.spawn_n', self._fake_spawn_n): - with mock.patch.object(requests, 'post') as poster: -@@ -132,8 +142,11 @@ class TestAlarmNotifier(base.TestCase): - def test_notify_alarm_rest_action_with_ssl_verify_disable_by_cfg(self): - action = 'https://host/action' - -- cfg.CONF.set_override("rest_notifier_ssl_verify", False, -- group='alarm') -+ try: -+ cfg.CONF.set_override("rest_notifier_ssl_verify", False, -+ group='alarm') -+ except: -+ self.skipTest('Skipped by Ubuntu') - - with mock.patch('eventlet.spawn_n', self._fake_spawn_n): - with mock.patch.object(requests, 'post') as poster: -@@ -143,6 +156,7 @@ class TestAlarmNotifier(base.TestCase): - verify=False) - - def test_notify_alarm_rest_action_with_ssl_verify_disable(self): -+ self.skipTest('Skipped by Ubuntu') - action = 'https://host/action?ceilometer-alarm-ssl-verify=0' - - with mock.patch('eventlet.spawn_n', self._fake_spawn_n): -@@ -155,8 +169,11 @@ class TestAlarmNotifier(base.TestCase): - def test_notify_alarm_rest_action_with_ssl_verify_enable_by_user(self): - action = 'https://host/action?ceilometer-alarm-ssl-verify=1' - -- cfg.CONF.set_override("rest_notifier_ssl_verify", False, -- group='alarm') -+ try: -+ cfg.CONF.set_override("rest_notifier_ssl_verify", False, -+ group='alarm') -+ except: -+ self.skipTest('Skipped by ubuntu') - - with mock.patch('eventlet.spawn_n', self._fake_spawn_n): - with mock.patch.object(requests, 'post') as poster: -diff -Naurp ceilometer-2013.2.rc1.orig/tests/api/v1/test_compute_duration_by_resource_scenarios.py ceilometer-2013.2.rc1/tests/api/v1/test_compute_duration_by_resource_scenarios.py ---- ceilometer-2013.2.rc1.orig/tests/api/v1/test_compute_duration_by_resource_scenarios.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/api/v1/test_compute_duration_by_resource_scenarios.py 2013-10-02 18:00:51.237793017 -0400 -@@ -85,7 +85,10 @@ class TestComputeDurationByResource(test - assert data['duration'] is None - - def _assert_times_match(self, actual, expected): -- actual = timeutils.parse_isotime(actual).replace(tzinfo=None) -+ try: -+ actual = timeutils.parse_isotime(actual).replace(tzinfo=None) -+ except: -+ self.skipTest('Skipped by Ubuntu') - assert actual == expected - - def test_overlap_range_start(self): -diff -Naurp ceilometer-2013.2.rc1.orig/tests/api/v2/test_app.py ceilometer-2013.2.rc1/tests/api/v2/test_app.py ---- ceilometer-2013.2.rc1.orig/tests/api/v2/test_app.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/api/v2/test_app.py 2013-10-02 18:06:51.001801595 -0400 -@@ -46,7 +46,11 @@ class TestApp(base.TestCase): - cfg.CONF.set_override('connection', "log://", group="database") - cfg.CONF.set_override("auth_uri", None, group=acl.OPT_GROUP_NAME) - -- api_app = app.setup_app() -+ try: -+ api_app = app.setup_app() -+ except: -+ self.skipTest('Skipped by Ubuntu') -+ - self.assertTrue(api_app.auth_uri.startswith('foottp')) - - def test_keystone_middleware_parse_conffile(self): -@@ -61,7 +65,11 @@ class TestApp(base.TestCase): - service.prepare_service(['ceilometer-api', - '--config-file=%s' % tmpfile]) - cfg.CONF.set_override('connection', "log://", group="database") -- api_app = app.setup_app() -+ try: -+ api_app = app.setup_app() -+ except: -+ self.skipTest6('Skipped by Ubuntu') -+ - self.assertTrue(api_app.auth_uri.startswith('barttp')) - os.unlink(tmpfile) - -diff -Naurp ceilometer-2013.2.rc1.orig/tests/api/v2/test_statistics_scenarios.py ceilometer-2013.2.rc1/tests/api/v2/test_statistics_scenarios.py ---- ceilometer-2013.2.rc1.orig/tests/api/v2/test_statistics_scenarios.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/api/v2/test_statistics_scenarios.py 2013-10-02 18:00:51.241793017 -0400 -@@ -1234,15 +1234,17 @@ class TestGroupBySource(base.FunctionalT - # tests. - - scenarios = [ -- ('mongodb', -- dict(database_connection=tests_db.MongoDBFakeConnectionUrl())), -- ('hbase', dict(database_connection='hbase://__test__')), -- ('db2', dict(database_connection=tests_db.DB2FakeConnectionUrl())), -+ # Test scenarios dropped by Ubuntu packaging. -+ #('mongodb', -+ # dict(database_connection=tests_db.MongoDBFakeConnectionUrl())), -+ #('hbase', dict(database_connection='hbase://__test__')), -+ #('db2', dict(database_connection=tests_db.DB2FakeConnectionUrl())), - ] - - PATH = '/meters/instance/statistics' - - def setUp(self): -+ self.skipTest('Skipped by Ubuntu Packaging.') - super(TestGroupBySource, self).setUp() - - test_sample_data = ( -diff -Naurp ceilometer-2013.2.rc1.orig/tests/collector/dispatcher/test_db.py ceilometer-2013.2.rc1/tests/collector/dispatcher/test_db.py ---- ceilometer-2013.2.rc1.orig/tests/collector/dispatcher/test_db.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/collector/dispatcher/test_db.py 2013-10-02 18:00:51.241793017 -0400 -@@ -30,7 +30,10 @@ class TestDispatcherDB(tests_base.TestCa - - def setUp(self): - super(TestDispatcherDB, self).setUp() -- self.dispatcher = database.DatabaseDispatcher(cfg.CONF) -+ try: -+ self.dispatcher = database.DatabaseDispatcher(cfg.CONF) -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.ctx = None - - def test_valid_message(self): -diff -Naurp ceilometer-2013.2.rc1.orig/tests/collector/test_service.py ceilometer-2013.2.rc1/tests/collector/test_service.py ---- ceilometer-2013.2.rc1.orig/tests/collector/test_service.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/collector/test_service.py 2013-10-02 18:00:51.241793017 -0400 -@@ -114,7 +114,10 @@ class TestUDPCollectorService(TestCollec - - def setUp(self): - super(TestUDPCollectorService, self).setUp() -- self.srv = service.UDPCollectorService() -+ try: -+ self.srv = service.UDPCollectorService() -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.counter = sample.Sample( - name='foobar', - type='bad', -@@ -189,7 +192,10 @@ class TestCollectorService(TestCollector - - def setUp(self): - super(TestCollectorService, self).setUp() -- self.srv = service.CollectorService('the-host', 'the-topic') -+ try: -+ self.srv = service.CollectorService('the-host', 'the-topic') -+ except: -+ self.skipTest('Skipped by ubuntu') - self.ctx = None - - @patch('ceilometer.pipeline.setup_pipeline', MagicMock()) -@@ -197,8 +203,11 @@ class TestCollectorService(TestCollector - # If we try to create a real RPC connection, init_host() never - # returns. Mock it out so we can establish the service - # configuration. -- with patch('ceilometer.openstack.common.rpc.create_connection'): -- self.srv.start() -+ try: -+ with patch('ceilometer.openstack.common.rpc.create_connection'): -+ self.srv.start() -+ except: -+ self.skipTest('Skipped by ubuntu') - - @patch('ceilometer.pipeline.setup_pipeline', MagicMock()) - def test_process_notification(self): -@@ -206,8 +215,11 @@ class TestCollectorService(TestCollector - # returns. Mock it out so we can establish the service - # configuration. - cfg.CONF.set_override("store_events", False, group="collector") -- with patch('ceilometer.openstack.common.rpc.create_connection'): -- self.srv.start() -+ try: -+ with patch('ceilometer.openstack.common.rpc.create_connection'): -+ self.srv.start() -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.srv.pipeline_manager.pipelines[0] = MagicMock() - self.srv.notification_manager = test_manager.TestExtensionManager( - [extension.Extension('test', -diff -Naurp ceilometer-2013.2.rc1.orig/tests/compute/pollsters/test_location_metadata.py ceilometer-2013.2.rc1/tests/compute/pollsters/test_location_metadata.py ---- ceilometer-2013.2.rc1.orig/tests/compute/pollsters/test_location_metadata.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/compute/pollsters/test_location_metadata.py 2013-10-02 18:00:51.241793017 -0400 -@@ -47,7 +47,10 @@ class TestLocationMetadata(test_base.Tes - - @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) - def setUp(self): -- self.manager = manager.AgentManager() -+ try: -+ self.manager = manager.AgentManager() -+ except: -+ self.skipTest('Skipped by ubuntu') - super(TestLocationMetadata, self).setUp() - - # Mimics an instance returned from nova api call -diff -Naurp ceilometer-2013.2.rc1.orig/tests/compute/test_manager.py ceilometer-2013.2.rc1/tests/compute/test_manager.py ---- ceilometer-2013.2.rc1.orig/tests/compute/test_manager.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/compute/test_manager.py 2013-10-02 18:00:51.241793017 -0400 -@@ -29,7 +29,10 @@ class TestManager(base.TestCase): - - @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) - def test_load_plugins(self): -- mgr = manager.AgentManager() -+ try: -+ mgr = manager.AgentManager() -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertIsNotNone(list(mgr.pollster_manager)) - - -@@ -45,7 +48,10 @@ class TestRunTasks(agentbase.BaseAgentMa - raise Exception - - def setup_manager(self): -- self.mgr = manager.AgentManager() -+ try: -+ self.mgr = manager.AgentManager() -+ except: -+ self.skipTest('Skipped by Ubuntu') - - @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) - def setUp(self): -diff -Naurp ceilometer-2013.2.rc1.orig/tests/storage/test_get_engine.py ceilometer-2013.2.rc1/tests/storage/test_get_engine.py ---- ceilometer-2013.2.rc1.orig/tests/storage/test_get_engine.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/storage/test_get_engine.py 2013-10-02 18:00:51.241793017 -0400 -@@ -31,7 +31,10 @@ class EngineTest(testtools.TestCase): - conf = mox.Mox().CreateMockAnything() - conf.database = mox.Mox().CreateMockAnything() - conf.database.connection = 'log://localhost' -- engine = storage.get_engine(conf) -+ try: -+ engine = storage.get_engine(conf) -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertIsInstance(engine, impl_log.LogStorage) - - def test_get_engine_no_such_engine(self): -diff -Naurp ceilometer-2013.2.rc1.orig/tests/test_bin.py ceilometer-2013.2.rc1/tests/test_bin.py ---- ceilometer-2013.2.rc1.orig/tests/test_bin.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/test_bin.py 2013-10-02 18:00:51.241793017 -0400 -@@ -36,14 +36,20 @@ class BinTestCase(base.TestCase): - tmp.write("connection=log://localhost\n") - - def test_dbsync_run(self): -- subp = subprocess.Popen(['ceilometer-dbsync', -- "--config-file=%s" % self.tempfile]) -- self.assertEqual(subp.wait(), 0) -+ try: -+ subp = subprocess.Popen(['ceilometer-dbsync', -+ "--config-file=%s" % self.tempfile]) -+ self.assertEqual(subp.wait(), 0) -+ except: -+ self.skipTest('Skipped by Ubuntu') - - def test_run_expirer(self): -- subp = subprocess.Popen(['ceilometer-expirer', -- "--config-file=%s" % self.tempfile]) -- self.assertEqual(subp.wait(), 0) -+ try: -+ subp = subprocess.Popen(['ceilometer-expirer', -+ "--config-file=%s" % self.tempfile]) -+ self.assertEqual(subp.wait(), 0) -+ except: -+ self.skipTest('Skipped by Ubuntu') - - - class BinSendCounterTestCase(base.TestCase): -@@ -59,11 +65,14 @@ class BinSendCounterTestCase(base.TestCa - "pipeline_cfg_file=%s\n" % pipeline_cfg_file) - - def test_send_counter_run(self): -- subp = subprocess.Popen([self.path_get('bin/ceilometer-send-counter'), -- "--config-file=%s" % self.tempfile, -- "--counter-resource=someuuid", -- "--counter-name=mycounter"]) -- self.assertEqual(subp.wait(), 0) -+ try: -+ subp = subprocess.Popen([self.path_get('bin/ceilometer-send-counter'), -+ "--config-file=%s" % self.tempfile, -+ "--counter-resource=someuuid", -+ "--counter-name=mycounter"]) -+ self.assertEqual(subp.wait(), 0) -+ except: -+ self.skipTest('Skipped by Ubuntu') - - - class BinApiTestCase(base.TestCase): -@@ -92,8 +101,11 @@ class BinApiTestCase(base.TestCase): - "port=%s\n" % self.api_port) - tmp.write("[database]\n") - tmp.write("connection=log://localhost\n") -- self.subp = subprocess.Popen(['ceilometer-api', -- "--config-file=%s" % self.tempfile]) -+ try: -+ self.subp = subprocess.Popen(['ceilometer-api', -+ "--config-file=%s" % self.tempfile]) -+ except: -+ self.skipTest('Skipped by Ubuntu') - - def tearDown(self): - super(BinApiTestCase, self).tearDown() -diff -Naurp ceilometer-2013.2.rc1.orig/tests/test_notifier.py ceilometer-2013.2.rc1/tests/test_notifier.py ---- ceilometer-2013.2.rc1.orig/tests/test_notifier.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/test_notifier.py 2013-10-02 18:00:51.241793017 -0400 -@@ -80,7 +80,10 @@ class TestNotifier(tests_base.TestCase): - }], - transformer_manager) - -- pub = notifier._pipeline_manager.pipelines[0].publishers[0] -+ try: -+ pub = notifier._pipeline_manager.pipelines[0].publishers[0] -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertEqual(len(pub.samples), 0) - notifier.notify(None, MESSAGE) - self.assertTrue(len(pub.samples) > 0) -diff -Naurp ceilometer-2013.2.rc1.orig/tests/test_service.py ceilometer-2013.2.rc1/tests/test_service.py ---- ceilometer-2013.2.rc1.orig/tests/test_service.py 2013-10-02 15:17:37.000000000 -0400 -+++ ceilometer-2013.2.rc1/tests/test_service.py 2013-10-02 18:00:51.241793017 -0400 -@@ -98,8 +98,8 @@ class ServiceRestartTest(base.TestCase): - - def tearDown(self): - super(ServiceRestartTest, self).tearDown() -- self.sub.kill() -- self.sub.wait() -+ #self.sub.kill() -+ #self.sub.wait() - - @staticmethod - def _check_process_alive(pid): -@@ -143,7 +143,10 @@ class ServiceRestartTest(base.TestCase): - self.check_process_alive() - - def _service_restart(self, cmd): -- self._spawn_service(cmd) -+ try: -+ self._spawn_service(cmd) -+ except: -+ self.skipTest('Skipped by Ubuntu') - - self.assertTrue(self.sub.pid) - #NOTE(Fengqian): Modify the pipleline configure file to see -@@ -159,7 +162,13 @@ class ServiceRestartTest(base.TestCase): - self.parse_output("Pipeline config: ").ret_stream)) - - def test_compute_service_restart(self): -- self._service_restart('ceilometer-agent-compute') -+ try: -+ self._service_restart('ceilometer-agent-compute') -+ except: -+ self.skipTest('Skipped by Ubuntu') - - def test_central_service_restart(self): -- self._service_restart('ceilometer-agent-central') -+ try: -+ self._service_restart('ceilometer-agent-central') -+ except: -+ self.skipTest('Skipped by Ubuntu')