python-swiftclient

Merge lp:~zulcss/python-swiftclient/fbtfs-testr into lp:~openstack-ubuntu-testing/python-swiftclient/havana

  1. fbtfs-testr
  2. Merge into havana
Proposed by Chuck Short
Status: Merged
Merged at revision: 29
Proposed branch: lp:~zulcss/python-swiftclient/fbtfs-testr
Merge into: lp:~openstack-ubuntu-testing/python-swiftclient/havana
Diff against target: 56 lines (+10/-3)
3 files modified
debian/changelog (+5/-1)
debian/control (+4/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~zulcss/python-swiftclient/fbtfs-testr
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Approve
Review via email: mp+164927@code.launchpad.net
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-05-15 13:56:04 +0000
3+++ debian/changelog 2013-05-21 15:54:05 +0000
4@@ -1,4 +1,4 @@
5-python-swiftclient (1:1.4.0.7.gaf4109d-0ubuntu1) UNRELEASED; urgency=low
6+python-swiftclient (1:1.4.0.13.gd5b6d29-0ubuntu1) UNRELEASED; urgency=low
7
8 [ James Page ]
9 * d/control: Fix typo in package description.
10@@ -8,6 +8,10 @@
11 * debian/control:
12 - Drop dependency of python-argparse
13 - Add dependency of python-d2to1 and python-pbr
14+ - Add python-subunit, python-coverage, python-testtools,
15+ and testrepository.
16+ * debian/rules: Run testr by hand since we dont want to
17+ run pep8 tests.
18
19 -- Chuck Short <zulcss@ubuntu.com> Wed, 15 May 2013 08:51:01 -0500
20
21
22=== modified file 'debian/control'
23--- debian/control 2013-05-15 13:56:04 +0000
24+++ debian/control 2013-05-21 15:54:05 +0000
25@@ -5,6 +5,7 @@
26 XSBC-Original-Maintainer: Adam Gandelman <adamg@canonical.com>
27 Build-Depends: debhelper (>= 8.0.0),
28 python-all (>= 2.6.6-3~),
29+ python-coverage,
30 python-d2to1,
31 python-eventlet,
32 python-fixtures,
33@@ -15,7 +16,9 @@
34 python-prettytable,
35 python-setuptools,
36 python-simplejson,
37- python-testtools
38+ python-testtools,
39+ python-subunit,
40+ testrepository
41 Standards-Version: 3.9.4
42 X-Python-Version: >= 2.7
43
44
45=== modified file 'debian/rules'
46--- debian/rules 2012-07-03 13:11:11 +0000
47+++ debian/rules 2013-05-21 15:54:05 +0000
48@@ -8,7 +8,7 @@
49
50 override_dh_auto_test:
51 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
52- set -e ; for pyversion in $(shell pyversions -r); do $$pyversion setup.py test; done
53+ testr init && testr run --parallel
54 endif
55
56 get-orig-source:

Subscribers

People subscribed via source and target branches