Merge ~cjwatson/launchpad:fix-git-tests into launchpad:master
Proposed by
Colin Watson
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | 09f8a40c2d76872a6059a2f662d00cf55caa3c57 |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | ~cjwatson/launchpad:fix-git-tests |
Merge into: | launchpad:master |
Diff against target: |
84 lines (+9/-11) 6 files modified
doc/_static/.gitignore (+0/-0) doc/_templates/.gitignore (+0/-0) lib/lp/answers/configure.zcml (+0/-2) lib/lp/app/tests/test_help.py (+0/-4) lib/lp/services/mail/tests/test_stub.py (+7/-5) scripts/update-version-info.sh (+2/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson (community) | Approve | ||
Kristian Glass (community) | Approve | ||
Ioana Lasc (community) | Approve | ||
Review via email: mp+373504@code.launchpad.net |
Commit message
Fix some tests that failed when running from git
Description of the change
A few odds and ends didn't quite work when running buildbot on the git migration: a few empty directories weren't preserved on the git side, and there were a couple of minor problems with version information.
To post a comment you must log in.