Merge lp:~jelmer/loggerhead/request-method into lp:loggerhead

Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 491
Proposed branch: lp:~jelmer/loggerhead/request-method
Merge into: lp:loggerhead
Diff against target: 123 lines (+24/-12)
1 file modified
loggerhead/tests/test_controllers.py (+24/-12)
To merge this branch: bzr merge lp:~jelmer/loggerhead/request-method
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+304868@code.launchpad.net

Description of the change

Fix running loggerhead tests with bzr-git installed, by always setting 'REQUEST_METHOD'.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'loggerhead/tests/test_controllers.py'
--- loggerhead/tests/test_controllers.py 2012-02-09 03:25:36 +0000
+++ loggerhead/tests/test_controllers.py 2016-09-04 15:15:37 +0000
@@ -80,7 +80,8 @@
80 def test_get_values_smoke(self):80 def test_get_values_smoke(self):
81 branch = self.make_bzrbranch_for_tree_shape(['a-file'])81 branch = self.make_bzrbranch_for_tree_shape(['a-file'])
82 branch_app = self.make_branch_app(branch)82 branch_app = self.make_branch_app(branch)
83 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/files'}83 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/files',
84 'REQUEST_METHOD': 'GET'}
84 inv_ui = branch_app.lookup_app(env)85 inv_ui = branch_app.lookup_app(env)
85 inv_ui.parse_args(env)86 inv_ui.parse_args(env)
86 values = inv_ui.get_values('', {}, {})87 values = inv_ui.get_values('', {}, {})
@@ -89,7 +90,8 @@
89 def test_json_render_smoke(self):90 def test_json_render_smoke(self):
90 branch = self.make_bzrbranch_for_tree_shape(['a-file'])91 branch = self.make_bzrbranch_for_tree_shape(['a-file'])
91 branch_app = self.make_branch_app(branch)92 branch_app = self.make_branch_app(branch)
92 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/+json/files'}93 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/+json/files',
94 'REQUEST_METHOD': 'GET'}
93 inv_ui = branch_app.lookup_app(env)95 inv_ui = branch_app.lookup_app(env)
94 self.assertOkJsonResponse(inv_ui, env)96 self.assertOkJsonResponse(inv_ui, env)
9597
@@ -110,7 +112,8 @@
110112
111 def test_get_values(self):113 def test_get_values(self):
112 branch_app = self.make_branch_app_for_revision_ui([], [])114 branch_app = self.make_branch_app_for_revision_ui([], [])
113 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/revision/2'}115 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/revision/2',
116 'REQUEST_METHOD': 'GET'}
114 rev_ui = branch_app.lookup_app(env)117 rev_ui = branch_app.lookup_app(env)
115 rev_ui.parse_args(env)118 rev_ui.parse_args(env)
116 self.assertIsInstance(rev_ui.get_values('', {}, []), dict)119 self.assertIsInstance(rev_ui.get_values('', {}, []), dict)
@@ -120,7 +123,8 @@
120 [('file', 'content\n')], [('file', 'new content\n')])123 [('file', 'content\n')], [('file', 'new content\n')])
121 env = {'SCRIPT_NAME': '/',124 env = {'SCRIPT_NAME': '/',
122 'PATH_INFO': '/revision/1/non-existent-file',125 'PATH_INFO': '/revision/1/non-existent-file',
123 'QUERY_STRING':'start_revid=1' }126 'QUERY_STRING':'start_revid=1',
127 'REQUEST_METHOD': 'GET'}
124 revision_ui = branch_app.lookup_app(env)128 revision_ui = branch_app.lookup_app(env)
125 path = revision_ui.parse_args(env)129 path = revision_ui.parse_args(env)
126 values = revision_ui.get_values(path, revision_ui.kwargs, {})130 values = revision_ui.get_values(path, revision_ui.kwargs, {})
@@ -132,7 +136,8 @@
132 [('file', 'content\n'), ('other-file', 'other\n')],136 [('file', 'content\n'), ('other-file', 'other\n')],
133 [('file', 'new content\n')])137 [('file', 'new content\n')])
134 env = {'SCRIPT_NAME': '/',138 env = {'SCRIPT_NAME': '/',
135 'PATH_INFO': '/revision/head:'}139 'PATH_INFO': '/revision/head:',
140 'REQUEST_METHOD': 'GET'}
136 revision_ui = branch_app.lookup_app(env)141 revision_ui = branch_app.lookup_app(env)
137 revision_ui.parse_args(env)142 revision_ui.parse_args(env)
138 values = revision_ui.get_values('', {}, {})143 values = revision_ui.get_values('', {}, {})
@@ -146,7 +151,8 @@
146 branch_app = self.make_branch_app_for_revision_ui(151 branch_app = self.make_branch_app_for_revision_ui(
147 [('file', 'content\n'), ('other-file', 'other\n')],152 [('file', 'content\n'), ('other-file', 'other\n')],
148 [('file', 'new content\n')])153 [('file', 'new content\n')])
149 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/+json/revision/head:'}154 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/+json/revision/head:',
155 'REQUEST_METHOD': 'GET'}
150 revision_ui = branch_app.lookup_app(env)156 revision_ui = branch_app.lookup_app(env)
151 self.assertOkJsonResponse(revision_ui, env)157 self.assertOkJsonResponse(revision_ui, env)
152158
@@ -231,7 +237,8 @@
231 def test_get_values_smoke(self):237 def test_get_values_smoke(self):
232 branch_app = self.make_branch_app_for_filediff_ui()238 branch_app = self.make_branch_app_for_filediff_ui()
233 env = {'SCRIPT_NAME': '/',239 env = {'SCRIPT_NAME': '/',
234 'PATH_INFO': '/+filediff/rev-2-id/rev-1-id/f-id'}240 'PATH_INFO': '/+filediff/rev-2-id/rev-1-id/f-id',
241 'REQUEST_METHOD': 'GET'}
235 filediff_ui = branch_app.lookup_app(env)242 filediff_ui = branch_app.lookup_app(env)
236 filediff_ui.parse_args(env)243 filediff_ui.parse_args(env)
237 values = filediff_ui.get_values('', {}, {})244 values = filediff_ui.get_values('', {}, {})
@@ -242,7 +249,8 @@
242 def test_json_render_smoke(self):249 def test_json_render_smoke(self):
243 branch_app = self.make_branch_app_for_filediff_ui()250 branch_app = self.make_branch_app_for_filediff_ui()
244 env = {'SCRIPT_NAME': '/',251 env = {'SCRIPT_NAME': '/',
245 'PATH_INFO': '/+json/+filediff/rev-2-id/rev-1-id/f-id'}252 'PATH_INFO': '/+json/+filediff/rev-2-id/rev-1-id/f-id',
253 'REQUEST_METHOD': 'GET'}
246 filediff_ui = branch_app.lookup_app(env)254 filediff_ui = branch_app.lookup_app(env)
247 self.assertOkJsonResponse(filediff_ui, env)255 self.assertOkJsonResponse(filediff_ui, env)
248256
@@ -264,7 +272,8 @@
264 def test_get_values_smoke(self):272 def test_get_values_smoke(self):
265 branch_app = self.make_branch_app_for_revlog_ui()273 branch_app = self.make_branch_app_for_revlog_ui()
266 env = {'SCRIPT_NAME': '/',274 env = {'SCRIPT_NAME': '/',
267 'PATH_INFO': '/+revlog/rev-id'}275 'PATH_INFO': '/+revlog/rev-id',
276 'REQUEST_METHOD': 'GET'}
268 revlog_ui = branch_app.lookup_app(env)277 revlog_ui = branch_app.lookup_app(env)
269 revlog_ui.parse_args(env)278 revlog_ui.parse_args(env)
270 values = revlog_ui.get_values('', {}, {})279 values = revlog_ui.get_values('', {}, {})
@@ -273,7 +282,8 @@
273282
274 def test_json_render_smoke(self):283 def test_json_render_smoke(self):
275 branch_app = self.make_branch_app_for_revlog_ui()284 branch_app = self.make_branch_app_for_revlog_ui()
276 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/+json/+revlog/rev-id'}285 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/+json/+revlog/rev-id',
286 'REQUEST_METHOD': 'GET'}
277 revlog_ui = branch_app.lookup_app(env)287 revlog_ui = branch_app.lookup_app(env)
278 self.assertOkJsonResponse(revlog_ui, env)288 self.assertOkJsonResponse(revlog_ui, env)
279289
@@ -284,7 +294,8 @@
284 return294 return
285 # A hook that returns None doesn't influence the searching for295 # A hook that returns None doesn't influence the searching for
286 # a controller.296 # a controller.
287 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/custom'}297 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/custom',
298 'REQUEST_METHOD': 'GET'}
288 myhook = lambda app, environ: None299 myhook = lambda app, environ: None
289 branch = self.make_branch('.')300 branch = self.make_branch('.')
290 self.addCleanup(branch.lock_read().unlock)301 self.addCleanup(branch.lock_read().unlock)
@@ -296,7 +307,8 @@
296307
297 def test_working_hook(self):308 def test_working_hook(self):
298 # A hook can provide an app to use for a particular request.309 # A hook can provide an app to use for a particular request.
299 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/custom'}310 env = {'SCRIPT_NAME': '', 'PATH_INFO': '/custom',
311 'REQUEST_METHOD': 'GET'}
300 myhook = lambda app, environ: "I am hooked"312 myhook = lambda app, environ: "I am hooked"
301 branch = self.make_branch('.')313 branch = self.make_branch('.')
302 self.addCleanup(branch.lock_read().unlock)314 self.addCleanup(branch.lock_read().unlock)

Subscribers

People subscribed via source and target branches