python-ceilometerclient

Merge lp:~zulcss/python-ceilometerclient/ftbfs into lp:~openstack-ubuntu-testing/python-ceilometerclient/havana

  1. ftbfs
  2. Merge into havana
Proposed by Chuck Short
Status: Merged
Approved by: Yolanda Robla
Approved revision: 8
Merged at revision: 8
Proposed branch: lp:~zulcss/python-ceilometerclient/ftbfs
Merge into: lp:~openstack-ubuntu-testing/python-ceilometerclient/havana
Diff against target: 60 lines (+18/-4)
3 files modified
debian/changelog (+12/-0)
debian/control (+5/-3)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~zulcss/python-ceilometerclient/ftbfs
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Approve
Review via email: mp+163961@code.launchpad.net

Description of the change

fixes ftbfs

To post a comment you must log in.
Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

Looks good to me

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-03-28 13:23:34 +0000
3+++ debian/changelog 2013-05-15 14:42:30 +0000
4@@ -1,3 +1,15 @@
5+python-ceilometerclient (1.0.0.16.g7091db4-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release.
8+ * debian/control:
9+ - Dropped python-unittest2, python-nose.
10+ - Added python-coverage, python-fixtures, python-subunit,
11+ python-testtools, python-testrepository
12+ - Dropped duplicate python-setuptools-git
13+ * debian/rules: Convert testsuite to use testr.
14+
15+ -- Chuck Short <zulcss@ubuntu.com> Wed, 15 May 2013 09:24:24 -0500
16+
17 python-ceilometerclient (1.0.0-0ubuntu1) raring; urgency=low
18
19 * New upstream version.
20
21=== modified file 'debian/control'
22--- debian/control 2013-03-28 13:09:39 +0000
23+++ debian/control 2013-05-15 14:42:30 +0000
24@@ -4,6 +4,9 @@
25 Maintainer: Chuck Short <zulcss@ubuntu.com>
26 Build-Depends: debhelper (>= 8.0.0),
27 python-all (>= 2.6.6-3~),
28+ python-coverage,
29+ python-fixtures,
30+ python-subunit,
31 python-setuptools,
32 python-setuptools-git,
33 python-prettytable,
34@@ -11,11 +14,10 @@
35 python-httplib2,
36 python-iso8601,
37 python-mox,
38- python-nose,
39 pep8,
40- python-setuptools-git,
41 python-sphinx,
42- python-unittest2
43+ testrepository,
44+ python-testtools
45 Standards-Version: 3.9.4
46 Homepage: http://launchpad.net/ceilometer
47
48
49=== modified file 'debian/rules'
50--- debian/rules 2013-03-28 13:19:19 +0000
51+++ debian/rules 2013-05-15 14:42:30 +0000
52@@ -8,7 +8,7 @@
53
54 override_dh_auto_test:
55 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
56- nosetests
57+ testr init && testr run
58 endif
59
60 get-orig-source:

Subscribers

People subscribed via source and target branches