loggerhead

Merge lp://qastaging/~cjwatson/loggerhead/fix-tox into lp://qastaging/loggerhead

  1. fix-tox
  2. Merge into trunk-rich
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 541
Merge reported by: Otto Co-Pilot
Merged at revision: 540
Proposed branch: lp://qastaging/~cjwatson/loggerhead/fix-tox
Merge into: lp://qastaging/loggerhead
Diff against target: 43 lines (+6/-1)
3 files modified
loggerhead/tests/test_controllers.py (+2/-0)
requirements.txt (+1/-0)
tox.ini (+3/-1)
To merge this branch: bzr merge lp://qastaging/~cjwatson/loggerhead/fix-tox
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+430053@code.qastaging.launchpad.net

Commit message

Fix running tests in tox.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/loggerhead/42/

lp://qastaging/~cjwatson/loggerhead/fix-tox updated
541. By Colin Watson

Pin patiencediff < 0.2.3 on Python 3.5.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches