Merge ~pappacena/launchpad:testfix-doctest-using-gunicorn into launchpad:master

Proposed by Thiago F. Pappacena
Status: Merged
Approved by: Thiago F. Pappacena
Approved revision: f156857ba7e5300063ee07d0aa074ef6789e508f
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pappacena/launchpad:testfix-doctest-using-gunicorn
Merge into: launchpad:master
Diff against target: 37 lines (+9/-4)
2 files modified
lib/lp/services/config/doc/canonical-config.txt (+6/-1)
lib/lp/services/webapp/doc/webapp-publication.txt (+3/-3)
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Review via email: mp+397373@code.launchpad.net

Commit message

Fixing tests to use gunicorn definitions

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/services/config/doc/canonical-config.txt b/lib/lp/services/config/doc/canonical-config.txt
2index 91f676b..3b6af93 100644
3--- a/lib/lp/services/config/doc/canonical-config.txt
4+++ b/lib/lp/services/config/doc/canonical-config.txt
5@@ -86,8 +86,13 @@ ZConfig.
6 >>> config.devmode
7 True
8
9+ >>> config.use_gunicorn
10+ True
11+
12+config.servers are only available when using Zope server (deprecated).
13+
14 >>> len(config.servers)
15- 4
16+ 0
17
18
19 Working with test configurations
20diff --git a/lib/lp/services/webapp/doc/webapp-publication.txt b/lib/lp/services/webapp/doc/webapp-publication.txt
21index 8be85b6..7329dbb 100644
22--- a/lib/lp/services/webapp/doc/webapp-publication.txt
23+++ b/lib/lp/services/webapp/doc/webapp-publication.txt
24@@ -417,10 +417,10 @@ listens on a particular port.
25
26 Find the port the Private XMLRPC service is listening on.
27
28- >>> for server in config.servers:
29- ... if server.type == 'PrivateXMLRPC':
30- ... private_port = server.address[1]
31+ >>> config.use_gunicorn
32+ True
33
34+ >>> private_port = config.vhost.xmlrpc_private.private_port
35 >>> print_request_and_publication(
36 ... 'xmlrpc-private.launchpad.test', method='POST',
37 ... mime_type='application/xml')