loggerhead

Merge lp:~cjwatson/loggerhead/fix-tox into lp: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:~cjwatson/loggerhead/fix-tox
Merge into: lp: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:~cjwatson/loggerhead/fix-tox
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+430053@code.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:~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
1=== modified file 'loggerhead/tests/test_controllers.py'
2--- loggerhead/tests/test_controllers.py 2022-08-31 14:04:38 +0000
3+++ loggerhead/tests/test_controllers.py 2022-09-21 12:06:27 +0000
4@@ -58,6 +58,7 @@
5 env = {
6 'SCRIPT_NAME': '',
7 'PATH_INFO': '/files',
8+ 'REQUEST_METHOD': 'GET',
9 'wsgi.url_scheme': 'http',
10 'SERVER_NAME': 'localhost',
11 'SERVER_PORT': '80',
12@@ -71,6 +72,7 @@
13 env = {
14 'SCRIPT_NAME': '',
15 'PATH_INFO': '/files',
16+ 'REQUEST_METHOD': 'GET',
17 'wsgi.url_scheme': 'http',
18 'SERVER_NAME': 'localhost',
19 'SERVER_PORT': '80',
20
21=== modified file 'requirements.txt'
22--- requirements.txt 2022-08-08 16:33:50 +0000
23+++ requirements.txt 2022-09-21 12:06:27 +0000
24@@ -12,3 +12,4 @@
25 Pygments; python_version > "3.5"
26 certifi < 2022.5.18; python_version <= "3.5"
27 fixtures < 4.0.0; python_version <= "3.5"
28+patiencediff < 0.2.3; python_version <= "3.5"
29
30=== modified file 'tox.ini'
31--- tox.ini 2021-12-17 21:39:45 +0000
32+++ tox.ini 2022-09-21 12:06:27 +0000
33@@ -3,7 +3,9 @@
34 skipsdist=True
35
36 [testenv]
37-deps = -rrequirements.txt
38+deps =
39+ -rrequirements.txt
40+ .
41 commands = brz selftest -v breezy.plugins.loggerhead --strict
42 setenv =
43 py35: VIRTUALENV_DOWNLOAD = 0

Subscribers

People subscribed via source and target branches