Merge lp:~julian-edwards/maas/packaging into lp:~maas-maintainers/maas/packaging

Proposed by Julian Edwards on 2012-09-20
Status: Merged
Approved by: Julian Edwards on 2012-09-20
Approved revision: no longer in the source branch.
Merged at revision: 89
Proposed branch: lp:~julian-edwards/maas/packaging
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 12 lines (+1/-1)
1 file modified
debian/tests/maas-package-test (+1/-1)
To merge this branch: bzr merge lp:~julian-edwards/maas/packaging
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) 2012-09-20 Approve on 2012-09-20
Review via email: mp+125393@code.launchpad.net

Commit Message

Remove the top-level tests/ directory as it confuses bzr-builddeb, and put its tests in debian/tests instead.

Description of the Change

Remove the top-level tests/ directory as it confuses bzr-builddeb. See bug 1052805

To post a comment you must log in.
Jeroen T. Vermeulen (jtv) wrote :

Thank you thank you thank you

review: Approve
lp:~julian-edwards/maas/packaging updated on 2012-09-20
89. By Julian Edwards on 2012-09-20

[r=jtv][bug=1052805][author=julian-edwards] Remove the top-level tests/ directory as it confuses bzr-builddeb, and put its tests in debian/tests instead.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'tests/maas-integration.py' => 'debian/tests/maas-integration.py'
2=== modified file 'debian/tests/maas-package-test'
3--- debian/tests/maas-package-test 2012-09-10 19:28:15 +0000
4+++ debian/tests/maas-package-test 2012-09-20 02:26:17 +0000
5@@ -2,4 +2,4 @@
6 set -e -u
7 exec 2>&1
8 pip install sst
9-nosetests tests/maas-integration.py
10+nosetests debian/tests/maas-integration.py
11
12=== removed directory 'tests'

Subscribers

People subscribed via source and target branches