lazr.restful

Merge lp:~cjwatson/lazr.restful/fix-tests into lp:lazr.restful

  1. fix-tests
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 227
Proposed branch: lp:~cjwatson/lazr.restful/fix-tests
Merge into: lp:lazr.restful
Diff against target: 55 lines (+9/-5)
3 files modified
NEWS.txt (+5/-0)
src/lazr/restful/docs/webservice-declarations.txt (+3/-4)
src/lazr/restful/example/base/tests/collection.txt (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/lazr.restful/fix-tests
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
LAZR Developers Pending
Review via email: mp+374908@code.launchpad.net

Commit message

Fix a couple of test failures with newer dependency versions.

To post a comment you must log in.
lp:~cjwatson/lazr.restful/fix-tests updated
226. By Colin Watson

Merge trunk.

Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS.txt'
2--- NEWS.txt 2019-11-02 23:58:59 +0000
3+++ NEWS.txt 2019-11-03 18:40:32 +0000
4@@ -19,6 +19,11 @@
5 Fixed bug 1803564: Values from requests that contain only whitespace are now
6 interpreted correctly.
7
8+Fix test failures with zope.configuration >= 4.3.0.
9+
10+Fix test failures with Python >= 2.7.17 (or backported fixes for
11+CVE-2019-9740).
12+
13 0.20.1 (2018-02-21)
14 ===================
15
16
17=== modified file 'src/lazr/restful/docs/webservice-declarations.txt'
18--- src/lazr/restful/docs/webservice-declarations.txt 2018-09-28 15:41:05 +0000
19+++ src/lazr/restful/docs/webservice-declarations.txt 2019-11-03 18:40:32 +0000
20@@ -2699,10 +2699,10 @@
21 >>> register_test_module('wrongorder', WrongOrderVersions)
22 Traceback (most recent call last):
23 ...
24- ConfigurationExecutionError: <type 'exceptions.AssertionError'>:
25+ ConfigurationExecutionError: ...AssertionError...
26 Annotations on "WrongOrderVersions.method" put an earlier version
27 on top of a later version: "beta", "2.0", "1.0". The correct order
28- is: "beta", "1.0", "2.0". ...
29+ is: "beta", "1.0", "2.0"...
30
31 Here's a class in which a named operation is removed in version 1.0
32 and then annotated without being reinstated.
33@@ -2723,8 +2723,7 @@
34 ...
35 ConfigurationExecutionError: ... Method "method" contains
36 annotations for version "2.0", even though it's not published in
37- that version. The bad annotations are: "as", "params".
38- ...
39+ that version. The bad annotations are: "as", "params"...
40
41 Mutators as named operations
42 ----------------------------
43
44=== modified file 'src/lazr/restful/example/base/tests/collection.txt'
45--- src/lazr/restful/example/base/tests/collection.txt 2015-04-09 14:02:44 +0000
46+++ src/lazr/restful/example/base/tests/collection.txt 2019-11-03 18:40:32 +0000
47@@ -247,7 +247,7 @@
48 The error message may contain Unicode characters:
49
50 >>> from lazr.restful.testing.helpers import encode_response
51- >>> url = u"/cookbooks?ws.op=find_for_cuisine&cuisine=\N{SNOWMAN}"
52+ >>> url = u"/cookbooks?ws.op=find_for_cuisine&cuisine=%E2%98%83"
53 >>> response = webservice.get(url.encode("utf-8"))
54 >>> print encode_response(response)
55 HTTP/1.1 400 Bad Request

Subscribers

People subscribed via source and target branches