Merge lp:~corey.bryant/ubuntu/vivid/python-xvfbwrapper/enable-tests into lp:ubuntu/vivid/python-xvfbwrapper

Proposed by Corey Bryant
Status: Needs review
Proposed branch: lp:~corey.bryant/ubuntu/vivid/python-xvfbwrapper/enable-tests
Merge into: lp:ubuntu/vivid/python-xvfbwrapper
Diff against target: 47 lines (+11/-7)
3 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/rules (+2/-6)
To merge this branch: bzr merge lp:~corey.bryant/ubuntu/vivid/python-xvfbwrapper/enable-tests
Reviewer Review Type Date Requested Status
Dmitry Shachnev Needs Information
Review via email: mp+249594@code.launchpad.net
To post a comment you must log in.
3. By Corey Bryant

* d/rules: Enable test execution during build.
* d/control: Add xvfb to Build-Depends.

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

This package comes from Debian without changes, please submit the patch there as described in https://wiki.ubuntu.com/Debian/Bugs.

review: Needs Information

Unmerged revisions

3. By Corey Bryant

* d/rules: Enable test execution during build.
* d/control: Add xvfb to Build-Depends.

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 2014-06-17 16:18:45 +0000
3+++ debian/changelog 2015-02-13 02:03:34 +0000
4@@ -1,3 +1,10 @@
5+python-xvfbwrapper (0.2.4-1ubuntu1) UNRELEASED; urgency=medium
6+
7+ * d/rules: Enable test execution during build.
8+ * d/control: Add xvfb to Build-Depends.
9+
10+ -- Corey Bryant <corey.bryant@canonical.com> Thu, 12 Feb 2015 15:47:49 -0500
11+
12 python-xvfbwrapper (0.2.4-1) unstable; urgency=medium
13
14 * Initial release. (Closes: #752990)
15
16=== modified file 'debian/control'
17--- debian/control 2014-06-17 16:18:45 +0000
18+++ debian/control 2015-02-13 02:03:34 +0000
19@@ -12,7 +12,8 @@
20 python-setuptools,
21 python3-all,
22 python3-nose,
23- python3-setuptools
24+ python3-setuptools,
25+ xvfb
26 Standards-Version: 3.9.5
27 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-xvfbwrapper.git
28 Vcs-Git: git://anonscm.debian.org/openstack/python-xvfbwrapper.git
29
30=== modified file 'debian/rules'
31--- debian/rules 2014-06-17 16:18:45 +0000
32+++ debian/rules 2015-02-13 02:03:34 +0000
33@@ -21,12 +21,8 @@
34
35 override_dh_auto_test:
36 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
37- echo "Disabled tests, as they fail without X running"
38-# nosetests
39-# nosetests3
40-# set -e && for pyvers in $(PYTHONS) $(PYTHON3S); do \
41-# python$$pyvers setup.py test ; \
42-# done
43+ nosetests --verbose
44+ nosetests3 --verbose
45 endif
46
47 # Commands not to run

Subscribers

People subscribed via source and target branches

to all changes: