Ceilometer

Merge lp:~zulcss/ceilometer/tests into lp:~ubuntu-server-dev/ceilometer/havana

  1. tests
  2. Merge into havana
Proposed by Chuck Short
Status: Merged
Merged at revision: 46
Proposed branch: lp:~zulcss/ceilometer/tests
Merge into: lp:~ubuntu-server-dev/ceilometer/havana
Diff against target: 202 lines (+52/-29)
5 files modified
debian/changelog (+9/-0)
debian/control (+4/-4)
debian/patches/fix-setup-requirements.patch (+12/-3)
debian/patches/skip-database-tests.patch (+25/-21)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~zulcss/ceilometer/tests
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+176268@code.launchpad.net

Description of the change

fixes testsuite.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-07-19 18:51:39 +0000
3+++ debian/changelog 2013-07-22 18:58:24 +0000
4@@ -1,3 +1,12 @@
5+ceilometer (2013.2~b2-0ubuntu3) saucy; urgency=low
6+
7+ * debian/rules: Enable testsuite.
8+ * debian/control: Fix up run time dependencies.
9+ * debian/patches/fix-setup-requirements.patch: Refreshed
10+ * debian/patches/skip-database-tests.patch: Refreshed
11+
12+ -- Chuck Short <zulcss@ubuntu.com> Mon, 22 Jul 2013 18:06:05 +0000
13+
14 ceilometer (2013.2~b2-0ubuntu2) saucy; urgency=low
15
16 * debian/control: Fix sqlalchemy dependency.
17
18=== modified file 'debian/control'
19--- debian/control 2013-07-19 18:51:39 +0000
20+++ debian/control 2013-07-22 18:58:24 +0000
21@@ -62,7 +62,7 @@
22 Depends:
23 alembic,
24 msgpack-python,
25- python-anjson,
26+ python-anyjson,
27 python-ceilometerclient,
28 python-eventlet,
29 python-flask,
30@@ -77,12 +77,12 @@
31 python-oslo.config,
32 python-pecan,
33 python-pymongo,
34- python-pyyaml,
35+ python-yaml,
36 python-requests,
37 python-sqlalchemy,
38 python-stevedore,
39- python-swfitclient,
40- python-weob,
41+ python-swiftclient,
42+ python-webob,
43 python-wsme,
44 ${misc:Depends},
45 ${python:Depends}
46
47=== modified file 'debian/patches/fix-setup-requirements.patch'
48--- debian/patches/fix-setup-requirements.patch 2013-07-18 13:03:06 +0000
49+++ debian/patches/fix-setup-requirements.patch 2013-07-22 18:58:24 +0000
50@@ -1,6 +1,15 @@
51-diff -Naurp ceilometer-2013.2.a251.g267075b.orig/requirements.txt ceilometer-2013.2.a251.g267075b/requirements.txt
52---- ceilometer-2013.2.a251.g267075b.orig/requirements.txt 2013-07-17 13:05:52.000000000 -0400
53-+++ ceilometer-2013.2.a251.g267075b/requirements.txt 2013-07-18 08:43:29.669527850 -0400
54+diff -Naurp ceilometer-2013.2.b2.orig/requirements.txt ceilometer-2013.2.b2/requirements.txt
55+--- ceilometer-2013.2.b2.orig/requirements.txt 2013-07-18 15:34:33.000000000 +0000
56++++ ceilometer-2013.2.b2/requirements.txt 2013-07-22 17:46:30.067010706 +0000
57+@@ -4,7 +4,7 @@ WebOb>=1.2
58+ kombu>2.4.7
59+ iso8601
60+ argparse
61+-SQLAlchemy>=0.7,<=0.7.99
62++SQLAlchemy>=0.7,<=0.8.99
63+ sqlalchemy-migrate>=0.7.2
64+ alembic>=0.4.1
65+ pymongo>=2.2
66 @@ -16,13 +16,12 @@ stevedore>=0.9
67 msgpack-python
68 python-glanceclient
69
70=== modified file 'debian/patches/skip-database-tests.patch'
71--- debian/patches/skip-database-tests.patch 2013-07-19 14:04:40 +0000
72+++ debian/patches/skip-database-tests.patch 2013-07-22 18:58:24 +0000
73@@ -1,6 +1,6 @@
74 diff -Naurp ceilometer-2013.2.b2.orig/ceilometer/tests/db.py ceilometer-2013.2.b2/ceilometer/tests/db.py
75---- ceilometer-2013.2.b2.orig/ceilometer/tests/db.py 2013-07-18 11:34:34.000000000 -0400
76-+++ ceilometer-2013.2.b2/ceilometer/tests/db.py 2013-07-19 09:38:56.957571357 -0400
77+--- ceilometer-2013.2.b2.orig/ceilometer/tests/db.py 2013-07-18 15:34:34.000000000 +0000
78++++ ceilometer-2013.2.b2/ceilometer/tests/db.py 2013-07-22 17:53:35.155020840 +0000
79 @@ -31,6 +31,9 @@ class TestBase(test_base.TestCase):
80 super(TestBase, self).setUp()
81 cfg.CONF.set_override('connection', self.database_connection,
82@@ -13,8 +13,8 @@
83 self.conn.upgrade()
84 self.conn.clear()
85 diff -Naurp ceilometer-2013.2.b2.orig/ceilometer/tests/db.py.orig ceilometer-2013.2.b2/ceilometer/tests/db.py.orig
86---- ceilometer-2013.2.b2.orig/ceilometer/tests/db.py.orig 1969-12-31 19:00:00.000000000 -0500
87-+++ ceilometer-2013.2.b2/ceilometer/tests/db.py.orig 2013-07-18 11:34:34.000000000 -0400
88+--- ceilometer-2013.2.b2.orig/ceilometer/tests/db.py.orig 1970-01-01 00:00:00.000000000 +0000
89++++ ceilometer-2013.2.b2/ceilometer/tests/db.py.orig 2013-07-22 17:53:35.155020840 +0000
90 @@ -0,0 +1,36 @@
91 +# -*- encoding: utf-8 -*-
92 +#
93@@ -53,8 +53,8 @@
94 + self.conn.upgrade()
95 + self.conn.clear()
96 diff -Naurp ceilometer-2013.2.b2.orig/tests/api/v2/acl.py ceilometer-2013.2.b2/tests/api/v2/acl.py
97---- ceilometer-2013.2.b2.orig/tests/api/v2/acl.py 2013-07-18 11:34:34.000000000 -0400
98-+++ ceilometer-2013.2.b2/tests/api/v2/acl.py 2013-07-19 09:38:56.961571357 -0400
99+--- ceilometer-2013.2.b2.orig/tests/api/v2/acl.py 2013-07-18 15:34:34.000000000 +0000
100++++ ceilometer-2013.2.b2/tests/api/v2/acl.py 2013-07-22 18:09:46.331043995 +0000
101 @@ -148,60 +148,75 @@ class TestAPIACL(FunctionalTest):
102 # self.assertEqual(response.status_int, 401)
103
104@@ -133,11 +133,12 @@
105 + q=[{'field': 'project_id',
106 + 'value': 'project-wrong',
107 + }])
108+ #TODO(asalkeld) revert this with wsme-0.5b3+
109+ # self.assertEqual(data.status_int, 401)
110+- self.assertEqual(data.status_int, 400)
111++ self.assertEqual(data.status_int, 400)
112 + except:
113 + self.skipTest('Skipped by Ubuntu')
114- #TODO(asalkeld) revert this with wsme-0.5b3+
115- # self.assertEqual(data.status_int, 401)
116- self.assertEqual(data.status_int, 400)
117
118 def test_non_admin_two_projects(self):
119 - data = self.get_json('/meters',
120@@ -163,14 +164,15 @@
121 + {'field': 'project_id',
122 + 'value': 'project-naughty',
123 + }])
124+ #TODO(asalkeld) revert this with wsme-0.5b3+
125+ # self.assertEqual(data.status_int, 401)
126+- self.assertEqual(data.status_int, 400)
127++ self.assertEqual(data.status_int, 400)
128 + except:
129 + self.skipTest('Skipped by Ubuntu')
130- #TODO(asalkeld) revert this with wsme-0.5b3+
131- # self.assertEqual(data.status_int, 401)
132- self.assertEqual(data.status_int, 400)
133 diff -Naurp ceilometer-2013.2.b2.orig/tests/api/v2/test_app.py ceilometer-2013.2.b2/tests/api/v2/test_app.py
134---- ceilometer-2013.2.b2.orig/tests/api/v2/test_app.py 2013-07-18 11:34:33.000000000 -0400
135-+++ ceilometer-2013.2.b2/tests/api/v2/test_app.py 2013-07-19 09:38:56.961571357 -0400
136+--- ceilometer-2013.2.b2.orig/tests/api/v2/test_app.py 2013-07-18 15:34:33.000000000 +0000
137++++ ceilometer-2013.2.b2/tests/api/v2/test_app.py 2013-07-22 17:53:35.155020840 +0000
138 @@ -40,7 +40,10 @@ class TestApp(base.TestCase):
139 cfg.CONF.set_override("auth_version", "v2.0", group=acl.OPT_GROUP_NAME)
140 cfg.CONF.set_override("pipeline_cfg_file",
141@@ -184,8 +186,8 @@
142
143 def test_keystone_middleware_parse_conffile(self):
144 diff -Naurp ceilometer-2013.2.b2.orig/tests/test_bin.py ceilometer-2013.2.b2/tests/test_bin.py
145---- ceilometer-2013.2.b2.orig/tests/test_bin.py 2013-07-18 11:34:33.000000000 -0400
146-+++ ceilometer-2013.2.b2/tests/test_bin.py 2013-07-19 09:38:56.961571357 -0400
147+--- ceilometer-2013.2.b2.orig/tests/test_bin.py 2013-07-18 15:34:33.000000000 +0000
148++++ ceilometer-2013.2.b2/tests/test_bin.py 2013-07-22 18:03:52.627035562 +0000
149 @@ -36,13 +36,19 @@ class BinTestCase(base.TestCase):
150 tmp.write("connection=log://localhost\n")
151
152@@ -210,7 +212,7 @@
153 self.assertEqual(subp.wait(), 0)
154
155
156-@@ -59,10 +65,13 @@ class BinSendCounterTestCase(base.TestCa
157+@@ -59,11 +65,14 @@ class BinSendCounterTestCase(base.TestCa
158 "pipeline_cfg_file=%s\n" % pipeline_cfg_file)
159
160 def test_send_counter_run(self):
161@@ -218,16 +220,18 @@
162 - "--config-file=%s" % self.tempfile,
163 - "--counter-resource=someuuid",
164 - "--counter-name=mycounter"])
165+- self.assertEqual(subp.wait(), 0)
166 + try:
167 + subp = subprocess.Popen([self.path_get('bin/ceilometer-send-counter'),
168 + "--config-file=%s" % self.tempfile,
169 + "--counter-resource=someuuid",
170 + "--counter-name=mycounter"])
171++ self.assertEqual(subp.wait(), 0)
172 + except:
173-+ self.skiptest('Skipped by Ubuntu')
174- self.assertEqual(subp.wait(), 0)
175-
176-
177++ self.skipTest('Skipped by Ubuntu')
178+
179+
180+ class BinApiTestCase(base.TestCase):
181 @@ -92,9 +101,12 @@ class BinApiTestCase(base.TestCase):
182 "port=%s\n" % self.api_port)
183 tmp.write("[database]\n")
184
185=== modified file 'debian/rules'
186--- debian/rules 2013-07-19 14:04:40 +0000
187+++ debian/rules 2013-07-22 18:58:24 +0000
188@@ -13,7 +13,7 @@
189
190 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
191 override_dh_auto_test:
192- testr init && testr run || true
193+ testr init && testr run
194 endif
195
196 override_dh_install:
197@@ -22,4 +22,5 @@
198
199 override_dh_auto_clean:
200 rm -f etc/ceilometer/ceilometer.conf
201+ rm -rf .testrepository
202 dh_auto_clean

Subscribers

People subscribed via source and target branches