lazr.restful

Merge lp:~allenap/lazr.restful/james_w into lp:lazr.restful

  1. james_w
  2. Merge into trunk
Proposed by Gavin Panella
Status: Merged
Merged at revision: not available
Proposed branch: lp:~allenap/lazr.restful/james_w
Merge into: lp:lazr.restful
Diff against target: 30 lines
2 files modified
setup.py (+1/-1)
src/lazr/restful/example/base/tests/field.txt (+6/-3)
To merge this branch: bzr merge lp:~allenap/lazr.restful/james_w
Reviewer Review Type Date Requested Status
Guilherme Salgado (community) Approve
Review via email: mp+12414@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

Originally I prepared this branch to merges James Westby's lp:~james-w/lazr.restful/lazr.restful.fix_test_suite branch into trunk. However, there was a failing test, so it needs another review.

Revision history for this message
Gavin Panella (allenap) wrote :

Just wanted to add that the failing test is not James Westby's fault. It exists in trunk.

Revision history for this message
Guilherme Salgado (salgado) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2009-09-01 13:12:20 +0000
3+++ setup.py 2009-09-25 13:40:27 +0000
4@@ -91,5 +91,5 @@
5 'z3c.recipe.sphinxdoc'],
6 xml=['lxml',] # requiring this of normal users is too much
7 ),
8- test_suite='lazr.yourpkg.tests',
9+ test_suite='lazr.restful.tests',
10 )
11
12=== modified file 'src/lazr/restful/example/base/tests/field.txt'
13--- src/lazr/restful/example/base/tests/field.txt 2009-09-24 15:23:48 +0000
14+++ src/lazr/restful/example/base/tests/field.txt 2009-09-25 13:40:27 +0000
15@@ -56,9 +56,12 @@
16 "http://.../cookbooks/The%20Joy%20of%20Cooking"
17
18 >>> print webservice(link_field_url, 'PATCH', new_value)
19-
20- >>> print webservice.get(link_field_url).jsonBody()
21- http://.../cookbooks/The%20Joy%20of%20Cooking
22+ HTTP/1.1 209 Content Returned
23+ ...
24+ Content-Type: application/json
25+ ...
26+ <BLANKLINE>
27+ "http://cookbooks.dev/1.0/cookbooks/The%20Joy%20of%20Cooking"
28
29 The same rules for modifying a field apply whether you're modifying
30 the entry as a whole or just modifying a single field.

Subscribers

People subscribed via source and target branches