Merge lp:~zulcss/python-cinderclient/fixtures into lp:~ubuntu-server-dev/python-cinderclient/grizzly

Proposed by Chuck Short on 2013-01-03
Status: Merged
Approved by: Yolanda Robla on 2013-01-03
Approved revision: 17
Merged at revision: 17
Proposed branch: lp:~zulcss/python-cinderclient/fixtures
Merge into: lp:~ubuntu-server-dev/python-cinderclient/grizzly
Diff against target: 25 lines (+4/-1)
2 files modified
debian/changelog (+1/-0)
debian/control (+3/-1)
To merge this branch: bzr merge lp:~zulcss/python-cinderclient/fixtures
Reviewer Review Type Date Requested Status
Yolanda Robla (community) 2013-01-03 Approve on 2013-01-03
Review via email: mp+141751@code.launchpad.net

Description of the change

fixtures and testtools addition to fix a ftbfs.

To post a comment you must log in.
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-01-03 13:18:47 +0000
3+++ debian/changelog 2013-01-03 13:39:21 +0000
4@@ -3,6 +3,7 @@
5 [ Chuck Short ]
6 * New upstream release.
7 * debian/control: Add python-requests as a build dep
8+ * debian/control: Add python-testtools and python-fixtures as a build dep.
9
10 [ Yolanda Robla ]
11 * debian/control: add python-setuptools-git dependency
12
13=== modified file 'debian/control'
14--- debian/control 2012-12-29 19:11:32 +0000
15+++ debian/control 2013-01-03 13:39:21 +0000
16@@ -13,7 +13,9 @@
17 pep8,
18 python-sphinx,
19 python-unittest2,
20- python-setuptools-git (>= 0.4)
21+ python-setuptools-git (>= 0.4),
22+ python-testtools,
23+ python-fixtures
24 Standards-Version: 3.9.3
25 X-Python-Version: >= 2.5
26

Subscribers

People subscribed via source and target branches