Merge lp:~zulcss/ceilometer/havana-alarms-ftbfs into lp:~ubuntu-server-dev/ceilometer/havana
- havana-alarms-ftbfs
- Merge into havana
Proposed by
Chuck Short
Status: | Merged |
---|---|
Approved by: | Chuck Short |
Approved revision: | 68 |
Merged at revision: | 67 |
Proposed branch: | lp:~zulcss/ceilometer/havana-alarms-ftbfs |
Merge into: | lp:~ubuntu-server-dev/ceilometer/havana |
Diff against target: |
454 lines (+96/-93) 4 files modified
debian/ceilometer-common.install (+1/-1) debian/changelog (+5/-2) debian/control (+1/-1) debian/patches/skip-database-tests.patch (+89/-89) |
To merge this branch: | bzr merge lp:~zulcss/ceilometer/havana-alarms-ftbfs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Scott Moser | Approve | ||
Review via email: mp+188331@code.launchpad.net |
Commit message
Description of the change
Fixes FTBFS.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/ceilometer-common.install' | |||
2 | --- debian/ceilometer-common.install 2013-07-18 13:28:12 +0000 | |||
3 | +++ debian/ceilometer-common.install 2013-09-30 13:28:40 +0000 | |||
4 | @@ -3,7 +3,7 @@ | |||
5 | 3 | etc/ceilometer/policy.json etc/ceilometer | 3 | etc/ceilometer/policy.json etc/ceilometer |
6 | 4 | etc/ceilometer/sources.json etc/ceilometer | 4 | etc/ceilometer/sources.json etc/ceilometer |
7 | 5 | tools/show_data.py usr/share/doc/ceilometer | 5 | tools/show_data.py usr/share/doc/ceilometer |
8 | 6 | usr/bin/ceilometer-alarm-evaluator | ||
9 | 6 | usr/bin/ceilometer-alarm-notifier | 7 | usr/bin/ceilometer-alarm-notifier |
10 | 7 | usr/bin/ceilometer-alarm-singleton | ||
11 | 8 | usr/bin/ceilometer-dbsync | 8 | usr/bin/ceilometer-dbsync |
12 | 9 | usr/bin/ceilometer-expirer | 9 | usr/bin/ceilometer-expirer |
13 | 10 | 10 | ||
14 | === modified file 'debian/changelog' | |||
15 | --- debian/changelog 2013-09-19 15:36:08 +0000 | |||
16 | +++ debian/changelog 2013-09-30 13:28:40 +0000 | |||
17 | @@ -1,9 +1,9 @@ | |||
18 | 1 | ceilometer (2013.2~b3-0ubuntu2) UNRELEASED; urgency=low | 1 | ceilometer (2013.2~b3-0ubuntu2) UNRELEASED; urgency=low |
19 | 2 | 2 | ||
20 | 3 | * debian/patches/fix-setup-requirements.patch: Dropped no longer | 3 | * debian/patches/fix-setup-requirements.patch: Dropped no longer |
22 | 4 | needed. | 4 | needed. |
23 | 5 | * debian/patches/skip-database.patch: Refreshed | 5 | * debian/patches/skip-database.patch: Refreshed |
25 | 6 | * debian/control: | 6 | * debian/control: |
26 | 7 | - Add versioned dependency for python-pbr. | 7 | - Add versioned dependency for python-pbr. |
27 | 8 | - Bump version dependency for python-webob. | 8 | - Bump version dependency for python-webob. |
28 | 9 | - Add versioned dependency for alembic. | 9 | - Add versioned dependency for alembic. |
29 | @@ -33,6 +33,9 @@ | |||
30 | 33 | - Added binary dependency for python-netaddr. | 33 | - Added binary dependency for python-netaddr. |
31 | 34 | - Add python-six as a dependency. | 34 | - Add python-six as a dependency. |
32 | 35 | * debian/patches/fix-setup-requirements.patch: Bump sqlachemy version. | 35 | * debian/patches/fix-setup-requirements.patch: Bump sqlachemy version. |
33 | 36 | * debian/ceilometer-common.install: | ||
34 | 37 | - Dropped ceilometer-alarm-singleton, no longer exists. | ||
35 | 38 | - Added usr/bin/ceilometer-alarm-evaluator. | ||
36 | 36 | 39 | ||
37 | 37 | -- Chuck Short <zulcss@ubuntu.com> Fri, 13 Sep 2013 09:24:21 -0400 | 40 | -- Chuck Short <zulcss@ubuntu.com> Fri, 13 Sep 2013 09:24:21 -0400 |
38 | 38 | 41 | ||
39 | 39 | 42 | ||
40 | === modified file 'debian/control' | |||
41 | --- debian/control 2013-09-19 15:25:32 +0000 | |||
42 | +++ debian/control 2013-09-30 13:28:40 +0000 | |||
43 | @@ -29,7 +29,7 @@ | |||
44 | 29 | python-netaddr, | 29 | python-netaddr, |
45 | 30 | python-nova, | 30 | python-nova, |
46 | 31 | python-novaclient (>= 1:2.12.10), | 31 | python-novaclient (>= 1:2.12.10), |
48 | 32 | python-oslo.config (>= 1:1.2.0a3), | 32 | python-oslo.config (>= 1:1.2.0), |
49 | 33 | python-oslo.sphinx, | 33 | python-oslo.sphinx, |
50 | 34 | python-pbr (>= 0.5.21), | 34 | python-pbr (>= 0.5.21), |
51 | 35 | python-pecan (>= 0.2.0), | 35 | python-pecan (>= 0.2.0), |
52 | 36 | 36 | ||
53 | === modified file 'debian/patches/skip-database-tests.patch' | |||
54 | --- debian/patches/skip-database-tests.patch 2013-09-27 18:17:03 +0000 | |||
55 | +++ debian/patches/skip-database-tests.patch 2013-09-30 13:28:40 +0000 | |||
56 | @@ -1,8 +1,8 @@ | |||
62 | 1 | Index: upstream/ceilometer/tests/db.py | 1 | diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py |
63 | 2 | =================================================================== | 2 | index 6a767cf..58f2539 100644 |
64 | 3 | --- upstream.orig/ceilometer/tests/db.py 2013-09-27 11:16:25.365799203 -0700 | 3 | --- a/ceilometer/tests/db.py |
65 | 4 | +++ upstream/ceilometer/tests/db.py 2013-09-27 11:16:25.353799203 -0700 | 4 | +++ b/ceilometer/tests/db.py |
66 | 5 | @@ -41,8 +41,8 @@ | 5 | @@ -41,8 +41,8 @@ class TestBase(test_base.TestCase): |
67 | 6 | message='.*you must provide a username and password.*') | 6 | message='.*you must provide a username and password.*') |
68 | 7 | try: | 7 | try: |
69 | 8 | self.conn = storage.get_connection(cfg.CONF) | 8 | self.conn = storage.get_connection(cfg.CONF) |
70 | @@ -13,7 +13,7 @@ | |||
71 | 13 | self.conn.upgrade() | 13 | self.conn.upgrade() |
72 | 14 | 14 | ||
73 | 15 | def tearDown(self): | 15 | def tearDown(self): |
75 | 16 | @@ -56,9 +56,7 @@ | 16 | @@ -56,9 +56,7 @@ class MongoDBFakeConnectionUrl(object): |
76 | 17 | def __init__(self): | 17 | def __init__(self): |
77 | 18 | self.url = os.environ.get('CEILOMETER_TEST_MONGODB_URL') | 18 | self.url = os.environ.get('CEILOMETER_TEST_MONGODB_URL') |
78 | 19 | if not self.url: | 19 | if not self.url: |
79 | @@ -24,7 +24,7 @@ | |||
80 | 24 | 24 | ||
81 | 25 | def __str__(self): | 25 | def __str__(self): |
82 | 26 | return '%(url)s_%(db)s' % dict(url=self.url, db=uuid.uuid4().hex) | 26 | return '%(url)s_%(db)s' % dict(url=self.url, db=uuid.uuid4().hex) |
84 | 27 | @@ -83,7 +81,4 @@ | 27 | @@ -83,7 +81,4 @@ class MixinTestsWithBackendScenarios(object): |
85 | 28 | 28 | ||
86 | 29 | scenarios = [ | 29 | scenarios = [ |
87 | 30 | ('sqlalchemy', dict(database_connection='sqlite://')), | 30 | ('sqlalchemy', dict(database_connection='sqlite://')), |
88 | @@ -32,11 +32,11 @@ | |||
89 | 32 | - ('hbase', dict(database_connection='hbase://__test__')), | 32 | - ('hbase', dict(database_connection='hbase://__test__')), |
90 | 33 | - ('db2', dict(database_connection=DB2FakeConnectionUrl())), | 33 | - ('db2', dict(database_connection=DB2FakeConnectionUrl())), |
91 | 34 | ] | 34 | ] |
97 | 35 | Index: upstream/tests/agentbase.py | 35 | diff --git a/tests/agentbase.py b/tests/agentbase.py |
98 | 36 | =================================================================== | 36 | index 383b8e7..23d6f65 100644 |
99 | 37 | --- upstream.orig/tests/agentbase.py 2013-09-27 11:16:25.365799203 -0700 | 37 | --- a/tests/agentbase.py |
100 | 38 | +++ upstream/tests/agentbase.py 2013-09-27 11:16:25.357799203 -0700 | 38 | +++ b/tests/agentbase.py |
101 | 39 | @@ -174,7 +174,10 @@ | 39 | @@ -175,7 +175,10 @@ class BaseAgentManagerTestCase(base.TestCase): |
102 | 40 | self.assertEqual(len(polling_tasks), 1) | 40 | self.assertEqual(len(polling_tasks), 1) |
103 | 41 | self.assertTrue(60 in polling_tasks.keys()) | 41 | self.assertTrue(60 in polling_tasks.keys()) |
104 | 42 | self.mgr.interval_task(polling_tasks.values()[0]) | 42 | self.mgr.interval_task(polling_tasks.values()[0]) |
105 | @@ -48,7 +48,7 @@ | |||
106 | 48 | self.assertEqual(pub.samples[0], self.Pollster.test_data) | 48 | self.assertEqual(pub.samples[0], self.Pollster.test_data) |
107 | 49 | 49 | ||
108 | 50 | def test_setup_polling_tasks_multiple_interval(self): | 50 | def test_setup_polling_tasks_multiple_interval(self): |
110 | 51 | @@ -243,7 +246,10 @@ | 51 | @@ -244,7 +247,10 @@ class BaseAgentManagerTestCase(base.TestCase): |
111 | 52 | self.assertEqual(len(polling_tasks.keys()), 1) | 52 | self.assertEqual(len(polling_tasks.keys()), 1) |
112 | 53 | polling_tasks.get(10) | 53 | polling_tasks.get(10) |
113 | 54 | self.mgr.interval_task(polling_tasks.get(10)) | 54 | self.mgr.interval_task(polling_tasks.get(10)) |
114 | @@ -59,12 +59,12 @@ | |||
115 | 59 | + self.skipTest("Skipped by Ubuntu") | 59 | + self.skipTest("Skipped by Ubuntu") |
116 | 60 | self.assertEqual(len(pub.samples), 0) | 60 | self.assertEqual(len(pub.samples), 0) |
117 | 61 | 61 | ||
124 | 62 | def test_manager_exception_persistency(self): | 62 | def test_agent_manager_initialize_service_hook(self): |
125 | 63 | Index: upstream/tests/alarm/test_notifier.py | 63 | diff --git a/tests/alarm/test_notifier.py b/tests/alarm/test_notifier.py |
126 | 64 | =================================================================== | 64 | index 3d71b75..46ea1aa 100644 |
127 | 65 | --- upstream.orig/tests/alarm/test_notifier.py 2013-09-27 11:16:25.365799203 -0700 | 65 | --- a/tests/alarm/test_notifier.py |
128 | 66 | +++ upstream/tests/alarm/test_notifier.py 2013-09-27 11:16:25.357799203 -0700 | 66 | +++ b/tests/alarm/test_notifier.py |
129 | 67 | @@ -58,7 +58,10 @@ | 67 | @@ -58,7 +58,10 @@ class TestAlarmNotifier(base.TestCase): |
130 | 68 | 'reason': 'Everything is on fire', | 68 | 'reason': 'Everything is on fire', |
131 | 69 | } | 69 | } |
132 | 70 | self.service.notify_alarm(context.get_admin_context(), data) | 70 | self.service.notify_alarm(context.get_admin_context(), data) |
133 | @@ -76,7 +76,7 @@ | |||
134 | 76 | self.assertEqual(len(notifications), 1) | 76 | self.assertEqual(len(notifications), 1) |
135 | 77 | self.assertEqual(notifications[0], ( | 77 | self.assertEqual(notifications[0], ( |
136 | 78 | urlparse.urlsplit(data['actions'][0]), | 78 | urlparse.urlsplit(data['actions'][0]), |
138 | 79 | @@ -90,6 +93,7 @@ | 79 | @@ -90,6 +93,7 @@ class TestAlarmNotifier(base.TestCase): |
139 | 80 | return notification | 80 | return notification |
140 | 81 | 81 | ||
141 | 82 | def test_notify_alarm_rest_action_ok(self): | 82 | def test_notify_alarm_rest_action_ok(self): |
142 | @@ -84,7 +84,7 @@ | |||
143 | 84 | action = 'http://host/action' | 84 | action = 'http://host/action' |
144 | 85 | 85 | ||
145 | 86 | with mock.patch('eventlet.spawn_n', self._fake_spawn_n): | 86 | with mock.patch('eventlet.spawn_n', self._fake_spawn_n): |
147 | 87 | @@ -102,8 +106,11 @@ | 87 | @@ -102,8 +106,11 @@ class TestAlarmNotifier(base.TestCase): |
148 | 88 | action = 'https://host/action' | 88 | action = 'https://host/action' |
149 | 89 | certificate = "/etc/ssl/cert/whatever.pem" | 89 | certificate = "/etc/ssl/cert/whatever.pem" |
150 | 90 | 90 | ||
151 | @@ -98,7 +98,7 @@ | |||
152 | 98 | 98 | ||
153 | 99 | with mock.patch('eventlet.spawn_n', self._fake_spawn_n): | 99 | with mock.patch('eventlet.spawn_n', self._fake_spawn_n): |
154 | 100 | with mock.patch.object(requests, 'post') as poster: | 100 | with mock.patch.object(requests, 'post') as poster: |
156 | 101 | @@ -117,10 +124,13 @@ | 101 | @@ -117,10 +124,13 @@ class TestAlarmNotifier(base.TestCase): |
157 | 102 | certificate = "/etc/ssl/cert/whatever.pem" | 102 | certificate = "/etc/ssl/cert/whatever.pem" |
158 | 103 | key = "/etc/ssl/cert/whatever.key" | 103 | key = "/etc/ssl/cert/whatever.key" |
159 | 104 | 104 | ||
160 | @@ -116,7 +116,7 @@ | |||
161 | 116 | 116 | ||
162 | 117 | with mock.patch('eventlet.spawn_n', self._fake_spawn_n): | 117 | with mock.patch('eventlet.spawn_n', self._fake_spawn_n): |
163 | 118 | with mock.patch.object(requests, 'post') as poster: | 118 | with mock.patch.object(requests, 'post') as poster: |
165 | 119 | @@ -132,8 +142,11 @@ | 119 | @@ -132,8 +142,11 @@ class TestAlarmNotifier(base.TestCase): |
166 | 120 | def test_notify_alarm_rest_action_with_ssl_verify_disable_by_cfg(self): | 120 | def test_notify_alarm_rest_action_with_ssl_verify_disable_by_cfg(self): |
167 | 121 | action = 'https://host/action' | 121 | action = 'https://host/action' |
168 | 122 | 122 | ||
169 | @@ -130,7 +130,7 @@ | |||
170 | 130 | 130 | ||
171 | 131 | with mock.patch('eventlet.spawn_n', self._fake_spawn_n): | 131 | with mock.patch('eventlet.spawn_n', self._fake_spawn_n): |
172 | 132 | with mock.patch.object(requests, 'post') as poster: | 132 | with mock.patch.object(requests, 'post') as poster: |
174 | 133 | @@ -143,6 +156,7 @@ | 133 | @@ -143,6 +156,7 @@ class TestAlarmNotifier(base.TestCase): |
175 | 134 | verify=False) | 134 | verify=False) |
176 | 135 | 135 | ||
177 | 136 | def test_notify_alarm_rest_action_with_ssl_verify_disable(self): | 136 | def test_notify_alarm_rest_action_with_ssl_verify_disable(self): |
178 | @@ -138,7 +138,7 @@ | |||
179 | 138 | action = 'https://host/action?ceilometer-alarm-ssl-verify=0' | 138 | action = 'https://host/action?ceilometer-alarm-ssl-verify=0' |
180 | 139 | 139 | ||
181 | 140 | with mock.patch('eventlet.spawn_n', self._fake_spawn_n): | 140 | with mock.patch('eventlet.spawn_n', self._fake_spawn_n): |
183 | 141 | @@ -155,8 +169,11 @@ | 141 | @@ -155,8 +169,11 @@ class TestAlarmNotifier(base.TestCase): |
184 | 142 | def test_notify_alarm_rest_action_with_ssl_verify_enable_by_user(self): | 142 | def test_notify_alarm_rest_action_with_ssl_verify_enable_by_user(self): |
185 | 143 | action = 'https://host/action?ceilometer-alarm-ssl-verify=1' | 143 | action = 'https://host/action?ceilometer-alarm-ssl-verify=1' |
186 | 144 | 144 | ||
187 | @@ -152,11 +152,11 @@ | |||
188 | 152 | 152 | ||
189 | 153 | with mock.patch('eventlet.spawn_n', self._fake_spawn_n): | 153 | with mock.patch('eventlet.spawn_n', self._fake_spawn_n): |
190 | 154 | with mock.patch.object(requests, 'post') as poster: | 154 | with mock.patch.object(requests, 'post') as poster: |
196 | 155 | Index: upstream/tests/api/v1/test_compute_duration_by_resource_scenarios.py | 155 | diff --git a/tests/api/v1/test_compute_duration_by_resource_scenarios.py b/tests/api/v1/test_compute_duration_by_resource_scenarios.py |
197 | 156 | =================================================================== | 156 | index 775b890..5a2d26a 100644 |
198 | 157 | --- upstream.orig/tests/api/v1/test_compute_duration_by_resource_scenarios.py 2013-09-27 11:16:25.365799203 -0700 | 157 | --- a/tests/api/v1/test_compute_duration_by_resource_scenarios.py |
199 | 158 | +++ upstream/tests/api/v1/test_compute_duration_by_resource_scenarios.py 2013-09-27 11:16:25.357799203 -0700 | 158 | +++ b/tests/api/v1/test_compute_duration_by_resource_scenarios.py |
200 | 159 | @@ -85,7 +85,10 @@ | 159 | @@ -85,7 +85,10 @@ class TestComputeDurationByResource(tests_api.TestBase, |
201 | 160 | assert data['duration'] is None | 160 | assert data['duration'] is None |
202 | 161 | 161 | ||
203 | 162 | def _assert_times_match(self, actual, expected): | 162 | def _assert_times_match(self, actual, expected): |
204 | @@ -168,11 +168,11 @@ | |||
205 | 168 | assert actual == expected | 168 | assert actual == expected |
206 | 169 | 169 | ||
207 | 170 | def test_overlap_range_start(self): | 170 | def test_overlap_range_start(self): |
213 | 171 | Index: upstream/tests/api/v2/test_app.py | 171 | diff --git a/tests/api/v2/test_app.py b/tests/api/v2/test_app.py |
214 | 172 | =================================================================== | 172 | index 8033891..f2a0ac2 100644 |
215 | 173 | --- upstream.orig/tests/api/v2/test_app.py 2013-09-27 11:16:25.365799203 -0700 | 173 | --- a/tests/api/v2/test_app.py |
216 | 174 | +++ upstream/tests/api/v2/test_app.py 2013-09-27 11:16:25.357799203 -0700 | 174 | +++ b/tests/api/v2/test_app.py |
217 | 175 | @@ -45,7 +45,10 @@ | 175 | @@ -45,7 +45,10 @@ class TestApp(base.TestCase): |
218 | 176 | cfg.CONF.set_override("pipeline_cfg_file", | 176 | cfg.CONF.set_override("pipeline_cfg_file", |
219 | 177 | self.path_get("etc/ceilometer/pipeline.yaml")) | 177 | self.path_get("etc/ceilometer/pipeline.yaml")) |
220 | 178 | cfg.CONF.set_override('connection', "log://", group="database") | 178 | cfg.CONF.set_override('connection', "log://", group="database") |
221 | @@ -184,7 +184,7 @@ | |||
222 | 184 | self.assertEqual(api_app.auth_protocol, 'foottp') | 184 | self.assertEqual(api_app.auth_protocol, 'foottp') |
223 | 185 | 185 | ||
224 | 186 | def test_keystone_middleware_parse_conffile(self): | 186 | def test_keystone_middleware_parse_conffile(self): |
226 | 187 | @@ -60,7 +63,10 @@ | 187 | @@ -60,7 +63,10 @@ class TestApp(base.TestCase): |
227 | 188 | service.prepare_service(['ceilometer-api', | 188 | service.prepare_service(['ceilometer-api', |
228 | 189 | '--config-file=%s' % tmpfile]) | 189 | '--config-file=%s' % tmpfile]) |
229 | 190 | cfg.CONF.set_override('connection', "log://", group="database") | 190 | cfg.CONF.set_override('connection', "log://", group="database") |
230 | @@ -196,11 +196,11 @@ | |||
231 | 196 | self.assertEqual(api_app.auth_protocol, 'barttp') | 196 | self.assertEqual(api_app.auth_protocol, 'barttp') |
232 | 197 | os.unlink(tmpfile) | 197 | os.unlink(tmpfile) |
233 | 198 | 198 | ||
239 | 199 | Index: upstream/tests/api/v2/test_statistics_scenarios.py | 199 | diff --git a/tests/api/v2/test_statistics_scenarios.py b/tests/api/v2/test_statistics_scenarios.py |
240 | 200 | =================================================================== | 200 | index 61d05d7..081a1f9 100644 |
241 | 201 | --- upstream.orig/tests/api/v2/test_statistics_scenarios.py 2013-09-27 11:16:25.365799203 -0700 | 201 | --- a/tests/api/v2/test_statistics_scenarios.py |
242 | 202 | +++ upstream/tests/api/v2/test_statistics_scenarios.py 2013-09-27 11:16:25.357799203 -0700 | 202 | +++ b/tests/api/v2/test_statistics_scenarios.py |
243 | 203 | @@ -1234,15 +1234,17 @@ | 203 | @@ -1234,15 +1234,17 @@ class TestGroupBySource(base.FunctionalTest, |
244 | 204 | # tests. | 204 | # tests. |
245 | 205 | 205 | ||
246 | 206 | scenarios = [ | 206 | scenarios = [ |
247 | @@ -222,11 +222,11 @@ | |||
248 | 222 | super(TestGroupBySource, self).setUp() | 222 | super(TestGroupBySource, self).setUp() |
249 | 223 | 223 | ||
250 | 224 | test_sample_data = ( | 224 | test_sample_data = ( |
256 | 225 | Index: upstream/tests/collector/dispatcher/test_db.py | 225 | diff --git a/tests/collector/dispatcher/test_db.py b/tests/collector/dispatcher/test_db.py |
257 | 226 | =================================================================== | 226 | index a538a5d..7ca68ed 100644 |
258 | 227 | --- upstream.orig/tests/collector/dispatcher/test_db.py 2013-09-27 11:16:25.365799203 -0700 | 227 | --- a/tests/collector/dispatcher/test_db.py |
259 | 228 | +++ upstream/tests/collector/dispatcher/test_db.py 2013-09-27 11:16:25.357799203 -0700 | 228 | +++ b/tests/collector/dispatcher/test_db.py |
260 | 229 | @@ -30,7 +30,10 @@ | 229 | @@ -30,7 +30,10 @@ class TestDispatcherDB(tests_base.TestCase): |
261 | 230 | 230 | ||
262 | 231 | def setUp(self): | 231 | def setUp(self): |
263 | 232 | super(TestDispatcherDB, self).setUp() | 232 | super(TestDispatcherDB, self).setUp() |
264 | @@ -238,11 +238,11 @@ | |||
265 | 238 | self.ctx = None | 238 | self.ctx = None |
266 | 239 | 239 | ||
267 | 240 | def test_valid_message(self): | 240 | def test_valid_message(self): |
273 | 241 | Index: upstream/tests/collector/test_service.py | 241 | diff --git a/tests/collector/test_service.py b/tests/collector/test_service.py |
274 | 242 | =================================================================== | 242 | index 0bc94da..7c3c560 100644 |
275 | 243 | --- upstream.orig/tests/collector/test_service.py 2013-09-27 11:16:25.365799203 -0700 | 243 | --- a/tests/collector/test_service.py |
276 | 244 | +++ upstream/tests/collector/test_service.py 2013-09-27 11:16:25.357799203 -0700 | 244 | +++ b/tests/collector/test_service.py |
277 | 245 | @@ -114,7 +114,10 @@ | 245 | @@ -114,7 +114,10 @@ class TestUDPCollectorService(TestCollector): |
278 | 246 | 246 | ||
279 | 247 | def setUp(self): | 247 | def setUp(self): |
280 | 248 | super(TestUDPCollectorService, self).setUp() | 248 | super(TestUDPCollectorService, self).setUp() |
281 | @@ -254,7 +254,7 @@ | |||
282 | 254 | self.counter = sample.Sample( | 254 | self.counter = sample.Sample( |
283 | 255 | name='foobar', | 255 | name='foobar', |
284 | 256 | type='bad', | 256 | type='bad', |
286 | 257 | @@ -189,7 +192,10 @@ | 257 | @@ -189,7 +192,10 @@ class TestCollectorService(TestCollector): |
287 | 258 | 258 | ||
288 | 259 | def setUp(self): | 259 | def setUp(self): |
289 | 260 | super(TestCollectorService, self).setUp() | 260 | super(TestCollectorService, self).setUp() |
290 | @@ -266,7 +266,7 @@ | |||
291 | 266 | self.ctx = None | 266 | self.ctx = None |
292 | 267 | 267 | ||
293 | 268 | @patch('ceilometer.pipeline.setup_pipeline', MagicMock()) | 268 | @patch('ceilometer.pipeline.setup_pipeline', MagicMock()) |
295 | 269 | @@ -197,8 +203,11 @@ | 269 | @@ -197,8 +203,11 @@ class TestCollectorService(TestCollector): |
296 | 270 | # If we try to create a real RPC connection, init_host() never | 270 | # If we try to create a real RPC connection, init_host() never |
297 | 271 | # returns. Mock it out so we can establish the service | 271 | # returns. Mock it out so we can establish the service |
298 | 272 | # configuration. | 272 | # configuration. |
299 | @@ -280,7 +280,7 @@ | |||
300 | 280 | 280 | ||
301 | 281 | @patch('ceilometer.pipeline.setup_pipeline', MagicMock()) | 281 | @patch('ceilometer.pipeline.setup_pipeline', MagicMock()) |
302 | 282 | def test_process_notification(self): | 282 | def test_process_notification(self): |
304 | 283 | @@ -206,8 +215,11 @@ | 283 | @@ -206,8 +215,11 @@ class TestCollectorService(TestCollector): |
305 | 284 | # returns. Mock it out so we can establish the service | 284 | # returns. Mock it out so we can establish the service |
306 | 285 | # configuration. | 285 | # configuration. |
307 | 286 | cfg.CONF.set_override("store_events", False, group="collector") | 286 | cfg.CONF.set_override("store_events", False, group="collector") |
308 | @@ -294,11 +294,11 @@ | |||
309 | 294 | self.srv.pipeline_manager.pipelines[0] = MagicMock() | 294 | self.srv.pipeline_manager.pipelines[0] = MagicMock() |
310 | 295 | self.srv.notification_manager = test_manager.TestExtensionManager( | 295 | self.srv.notification_manager = test_manager.TestExtensionManager( |
311 | 296 | [extension.Extension('test', | 296 | [extension.Extension('test', |
317 | 297 | Index: upstream/tests/compute/pollsters/test_location_metadata.py | 297 | diff --git a/tests/compute/pollsters/test_location_metadata.py b/tests/compute/pollsters/test_location_metadata.py |
318 | 298 | =================================================================== | 298 | index a14ddfc..60619b5 100644 |
319 | 299 | --- upstream.orig/tests/compute/pollsters/test_location_metadata.py 2013-09-27 11:16:25.365799203 -0700 | 299 | --- a/tests/compute/pollsters/test_location_metadata.py |
320 | 300 | +++ upstream/tests/compute/pollsters/test_location_metadata.py 2013-09-27 11:16:25.357799203 -0700 | 300 | +++ b/tests/compute/pollsters/test_location_metadata.py |
321 | 301 | @@ -47,7 +47,10 @@ | 301 | @@ -47,7 +47,10 @@ class TestLocationMetadata(test_base.TestCase): |
322 | 302 | 302 | ||
323 | 303 | @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) | 303 | @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) |
324 | 304 | def setUp(self): | 304 | def setUp(self): |
325 | @@ -310,11 +310,11 @@ | |||
326 | 310 | super(TestLocationMetadata, self).setUp() | 310 | super(TestLocationMetadata, self).setUp() |
327 | 311 | 311 | ||
328 | 312 | # Mimics an instance returned from nova api call | 312 | # Mimics an instance returned from nova api call |
334 | 313 | Index: upstream/tests/compute/test_manager.py | 313 | diff --git a/tests/compute/test_manager.py b/tests/compute/test_manager.py |
335 | 314 | =================================================================== | 314 | index b3f3b3d..8e28a50 100644 |
336 | 315 | --- upstream.orig/tests/compute/test_manager.py 2013-09-27 11:16:25.365799203 -0700 | 315 | --- a/tests/compute/test_manager.py |
337 | 316 | +++ upstream/tests/compute/test_manager.py 2013-09-27 11:16:25.357799203 -0700 | 316 | +++ b/tests/compute/test_manager.py |
338 | 317 | @@ -29,7 +29,10 @@ | 317 | @@ -29,7 +29,10 @@ class TestManager(base.TestCase): |
339 | 318 | 318 | ||
340 | 319 | @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) | 319 | @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) |
341 | 320 | def test_load_plugins(self): | 320 | def test_load_plugins(self): |
342 | @@ -326,7 +326,7 @@ | |||
343 | 326 | self.assertIsNotNone(list(mgr.pollster_manager)) | 326 | self.assertIsNotNone(list(mgr.pollster_manager)) |
344 | 327 | 327 | ||
345 | 328 | 328 | ||
347 | 329 | @@ -45,7 +48,10 @@ | 329 | @@ -45,7 +48,10 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase): |
348 | 330 | raise Exception | 330 | raise Exception |
349 | 331 | 331 | ||
350 | 332 | def setup_manager(self): | 332 | def setup_manager(self): |
351 | @@ -338,11 +338,11 @@ | |||
352 | 338 | 338 | ||
353 | 339 | @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) | 339 | @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) |
354 | 340 | def setUp(self): | 340 | def setUp(self): |
360 | 341 | Index: upstream/tests/storage/test_get_engine.py | 341 | diff --git a/tests/storage/test_get_engine.py b/tests/storage/test_get_engine.py |
361 | 342 | =================================================================== | 342 | index 498b6f4..4824461 100644 |
362 | 343 | --- upstream.orig/tests/storage/test_get_engine.py 2013-09-27 11:16:25.365799203 -0700 | 343 | --- a/tests/storage/test_get_engine.py |
363 | 344 | +++ upstream/tests/storage/test_get_engine.py 2013-09-27 11:16:25.357799203 -0700 | 344 | +++ b/tests/storage/test_get_engine.py |
364 | 345 | @@ -31,7 +31,10 @@ | 345 | @@ -31,7 +31,10 @@ class EngineTest(testtools.TestCase): |
365 | 346 | conf = mox.Mox().CreateMockAnything() | 346 | conf = mox.Mox().CreateMockAnything() |
366 | 347 | conf.database = mox.Mox().CreateMockAnything() | 347 | conf.database = mox.Mox().CreateMockAnything() |
367 | 348 | conf.database.connection = 'log://localhost' | 348 | conf.database.connection = 'log://localhost' |
368 | @@ -354,11 +354,11 @@ | |||
369 | 354 | self.assertIsInstance(engine, impl_log.LogStorage) | 354 | self.assertIsInstance(engine, impl_log.LogStorage) |
370 | 355 | 355 | ||
371 | 356 | def test_get_engine_no_such_engine(self): | 356 | def test_get_engine_no_such_engine(self): |
377 | 357 | Index: upstream/tests/test_bin.py | 357 | diff --git a/tests/test_bin.py b/tests/test_bin.py |
378 | 358 | =================================================================== | 358 | index a358b57..bc2cd2a 100644 |
379 | 359 | --- upstream.orig/tests/test_bin.py 2013-09-27 11:16:25.365799203 -0700 | 359 | --- a/tests/test_bin.py |
380 | 360 | +++ upstream/tests/test_bin.py 2013-09-27 11:16:25.361799203 -0700 | 360 | +++ b/tests/test_bin.py |
381 | 361 | @@ -36,14 +36,20 @@ | 361 | @@ -36,14 +36,20 @@ class BinTestCase(base.TestCase): |
382 | 362 | tmp.write("connection=log://localhost\n") | 362 | tmp.write("connection=log://localhost\n") |
383 | 363 | 363 | ||
384 | 364 | def test_dbsync_run(self): | 364 | def test_dbsync_run(self): |
385 | @@ -385,7 +385,7 @@ | |||
386 | 385 | 385 | ||
387 | 386 | 386 | ||
388 | 387 | class BinSendCounterTestCase(base.TestCase): | 387 | class BinSendCounterTestCase(base.TestCase): |
390 | 388 | @@ -59,11 +65,14 @@ | 388 | @@ -59,11 +65,14 @@ class BinSendCounterTestCase(base.TestCase): |
391 | 389 | "pipeline_cfg_file=%s\n" % pipeline_cfg_file) | 389 | "pipeline_cfg_file=%s\n" % pipeline_cfg_file) |
392 | 390 | 390 | ||
393 | 391 | def test_send_counter_run(self): | 391 | def test_send_counter_run(self): |
394 | @@ -405,7 +405,7 @@ | |||
395 | 405 | 405 | ||
396 | 406 | 406 | ||
397 | 407 | class BinApiTestCase(base.TestCase): | 407 | class BinApiTestCase(base.TestCase): |
399 | 408 | @@ -92,8 +101,11 @@ | 408 | @@ -92,8 +101,11 @@ class BinApiTestCase(base.TestCase): |
400 | 409 | "port=%s\n" % self.api_port) | 409 | "port=%s\n" % self.api_port) |
401 | 410 | tmp.write("[database]\n") | 410 | tmp.write("[database]\n") |
402 | 411 | tmp.write("connection=log://localhost\n") | 411 | tmp.write("connection=log://localhost\n") |
403 | @@ -419,11 +419,11 @@ | |||
404 | 419 | 419 | ||
405 | 420 | def tearDown(self): | 420 | def tearDown(self): |
406 | 421 | super(BinApiTestCase, self).tearDown() | 421 | super(BinApiTestCase, self).tearDown() |
412 | 422 | Index: upstream/tests/test_notifier.py | 422 | diff --git a/tests/test_notifier.py b/tests/test_notifier.py |
413 | 423 | =================================================================== | 423 | index 814dca1..9a659fb 100644 |
414 | 424 | --- upstream.orig/tests/test_notifier.py 2013-09-27 11:16:25.365799203 -0700 | 424 | --- a/tests/test_notifier.py |
415 | 425 | +++ upstream/tests/test_notifier.py 2013-09-27 11:16:25.361799203 -0700 | 425 | +++ b/tests/test_notifier.py |
416 | 426 | @@ -80,7 +80,10 @@ | 426 | @@ -80,7 +80,10 @@ class TestNotifier(tests_base.TestCase): |
417 | 427 | }], | 427 | }], |
418 | 428 | transformer_manager) | 428 | transformer_manager) |
419 | 429 | 429 | ||
420 | @@ -435,11 +435,11 @@ | |||
421 | 435 | self.assertEqual(len(pub.samples), 0) | 435 | self.assertEqual(len(pub.samples), 0) |
422 | 436 | notifier.notify(None, MESSAGE) | 436 | notifier.notify(None, MESSAGE) |
423 | 437 | self.assertTrue(len(pub.samples) > 0) | 437 | self.assertTrue(len(pub.samples) > 0) |
429 | 438 | Index: upstream/tests/test_service.py | 438 | diff --git a/tests/test_service.py b/tests/test_service.py |
430 | 439 | =================================================================== | 439 | index 65580b6..8497648 100644 |
431 | 440 | --- upstream.orig/tests/test_service.py 2013-09-27 11:16:25.365799203 -0700 | 440 | --- a/tests/test_service.py |
432 | 441 | +++ upstream/tests/test_service.py 2013-09-27 11:16:25.361799203 -0700 | 441 | +++ b/tests/test_service.py |
433 | 442 | @@ -98,8 +98,8 @@ | 442 | @@ -98,8 +98,8 @@ class ServiceRestartTest(base.TestCase): |
434 | 443 | 443 | ||
435 | 444 | def tearDown(self): | 444 | def tearDown(self): |
436 | 445 | super(ServiceRestartTest, self).tearDown() | 445 | super(ServiceRestartTest, self).tearDown() |
437 | @@ -450,7 +450,7 @@ | |||
438 | 450 | 450 | ||
439 | 451 | @staticmethod | 451 | @staticmethod |
440 | 452 | def _check_process_alive(pid): | 452 | def _check_process_alive(pid): |
442 | 453 | @@ -143,7 +143,10 @@ | 453 | @@ -143,7 +143,10 @@ class ServiceRestartTest(base.TestCase): |
443 | 454 | self.check_process_alive() | 454 | self.check_process_alive() |
444 | 455 | 455 | ||
445 | 456 | def _service_restart(self, cmd): | 456 | def _service_restart(self, cmd): |
446 | @@ -462,7 +462,7 @@ | |||
447 | 462 | 462 | ||
448 | 463 | self.assertTrue(self.sub.pid) | 463 | self.assertTrue(self.sub.pid) |
449 | 464 | #NOTE(Fengqian): Modify the pipleline configure file to see | 464 | #NOTE(Fengqian): Modify the pipleline configure file to see |
451 | 465 | @@ -159,7 +162,13 @@ | 465 | @@ -159,7 +162,13 @@ class ServiceRestartTest(base.TestCase): |
452 | 466 | self.parse_output("Pipeline config: ").ret_stream)) | 466 | self.parse_output("Pipeline config: ").ret_stream)) |
453 | 467 | 467 | ||
454 | 468 | def test_compute_service_restart(self): | 468 | def test_compute_service_restart(self): |
lgtm