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
58
        env = {
58
        env = {
6
59
            'SCRIPT_NAME': '',
59
            'SCRIPT_NAME': '',
7
60
            'PATH_INFO': '/files',
60
            'PATH_INFO': '/files',
8
61
            'REQUEST_METHOD': 'GET',
9
61
            'wsgi.url_scheme': 'http',
62
            'wsgi.url_scheme': 'http',
10
62
            'SERVER_NAME': 'localhost',
63
            'SERVER_NAME': 'localhost',
11
63
            'SERVER_PORT': '80',
64
            'SERVER_PORT': '80',
12
@@ -71,6 +72,7 @@
13
71
        env = {
72
        env = {
14
72
            'SCRIPT_NAME': '',
73
            'SCRIPT_NAME': '',
15
73
            'PATH_INFO': '/files',
74
            'PATH_INFO': '/files',
16
75
            'REQUEST_METHOD': 'GET',
17
74
            'wsgi.url_scheme': 'http',
76
            'wsgi.url_scheme': 'http',
18
75
            'SERVER_NAME': 'localhost',
77
            'SERVER_NAME': 'localhost',
19
76
            'SERVER_PORT': '80',
78
            'SERVER_PORT': '80',
20
77
79
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
12
Pygments; python_version > "3.5"
12
Pygments; python_version > "3.5"
26
13
certifi < 2022.5.18; python_version <= "3.5"
13
certifi < 2022.5.18; python_version <= "3.5"
27
14
fixtures < 4.0.0; python_version <= "3.5"
14
fixtures < 4.0.0; python_version <= "3.5"
28
15
patiencediff < 0.2.3; python_version <= "3.5"
29
15
16
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
3
skipsdist=True
3
skipsdist=True
35
4
4
36
5
[testenv]
5
[testenv]
38
6
deps = -rrequirements.txt
6
deps =
39
7
    -rrequirements.txt
40
8
    .
41
7
commands = brz selftest -v breezy.plugins.loggerhead --strict
9
commands = brz selftest -v breezy.plugins.loggerhead --strict
42
8
setenv =
10
setenv =
43
9
    py35: VIRTUALENV_DOWNLOAD = 0
11
    py35: VIRTUALENV_DOWNLOAD = 0
Status:	Merged
Approved by:	Colin Watson on 2022-09-21
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jelmer Vernooij		2022-09-17	Approve on 2022-09-17
Review via email: mp+430053@code.launchpad.net