1
=== removed file 'lib/canonical/launchpad/pagetests/standalone/xx-librarian-upload-errors.txt'
2
--- lib/canonical/launchpad/pagetests/standalone/xx-librarian-upload-errors.txt	2010-09-22 15:49:41 +0000
3
+++ lib/canonical/launchpad/pagetests/standalone/xx-librarian-upload-errors.txt	1970-01-01 00:00:00 +0000
4
@@ -1,60 +0,0 @@
5
1
Librarian errors
6
2
================
7
3
8
4
Librarian errors are shown in a special error page. We record OOPSes
9
5
for these failures and display the OOPS ID in the error message.
10
6
11
7
    >>> from canonical.config import config
12
8
    >>> post_data = r"""
13
9
    ... POST /firefox/+bug/1/+addcomment HTTP/1.1
14
10
    ... Authorization: Basic Zm9vLmJhckBjYW5vbmljYWwuY29tOnRlc3Q=
15
11
    ... Content-Type: multipart/form-data; boundary=---------------------------482515227376903752137397980
16
12
    ...
17
13
    ... -----------------------------482515227376903752137397980
18
14
    ... Content-Disposition: form-data; name="field.subject"
19
15
    ...
20
16
    ... Re: Firefox does not support SVG
21
17
    ... -----------------------------482515227376903752137397980
22
18
    ... Content-Disposition: form-data; name="field.comment"
23
19
    ...
24
20
    ... -----------------------------482515227376903752137397980
25
21
    ... Content-Disposition: form-data; name="field.filecontent.used"
26
22
    ...
27
23
    ... -----------------------------482515227376903752137397980
28
24
    ... Content-Disposition: form-data; name="field.filecontent"; filename="foo.txt"
29
25
    ... Content-Type: text/plain
30
26
    ...
31
27
    ... file content
32
28
    ...
33
29
    ... -----------------------------482515227376903752137397980
34
30
    ... Content-Disposition: form-data; name="field.patch.used"
35
31
    ...
36
32
    ... -----------------------------482515227376903752137397980
37
33
    ... Content-Disposition: form-data; name="field.attachment_description"
38
34
    ...
39
35
    ... -----------------------------482515227376903752137397980
40
36
    ... Content-Disposition: form-data; name="field.actions.save"
41
37
    ...
42
38
    ... Post Comment
43
39
    ... -----------------------------482515227376903752137397980--
44
40
    ... """
45
41
    >>> real_upload_port = config.librarian.upload_port
46
42
    >>> # We can force a Librarian error by setting the Librarian upload
47
43
    >>> # port to the download port.
48
44
    >>> config.librarian.update(
49
45
    ...     [('upload_port', str(config.librarian.download_port))])
50
46
    []
51
47
    >>> response = http(post_data)
52
48
    >>> print extract_text(response.getOutput())
53
49
    HTTP/1.1 500 Internal Server Error
54
50
    ...
55
51
    We've recorded what happened. The error ID is:
56
52
    OOPS-...
57
53
    Traceback (most recent call last):
58
54
    ...
59
55
    UploadFailed: Server said: foo.txt 501 Not Implemented&lt;br /&gt;
60
56
    ...
61
57
62
58
    >>> config.librarian.update(
63
59
    ...     [('upload_port', str(real_upload_port))])
64
60
    []
65
61
0
66
=== removed file 'lib/canonical/launchpad/templates/launchpad-librarianfailure.pt'
67
--- lib/canonical/launchpad/templates/launchpad-librarianfailure.pt	2010-09-22 15:49:41 +0000
68
+++ lib/canonical/launchpad/templates/launchpad-librarianfailure.pt	1970-01-01 00:00:00 +0000
69
@@ -1,23 +0,0 @@
70
1
<html
71
2
  xmlns="http://www.w3.org/1999/xhtml"
72
3
  xmlns:tal="http://xml.zope.org/namespaces/tal"
73
4
  xmlns:metal="http://xml.zope.org/namespaces/metal"
74
5
  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
75
6
  metal:use-macro="view/macro:page/locationless"
76
7
  i18n:domain="launchpad"
77
8
>
78
9
  <body>
79
10
    <div class="top-portlet" metal:fill-slot="main">
80
11
      <h1 class="exception">Sorry, you can't do this right now</h1>
81
12
      <p>
82
13
      Sorry, you can't upload or download files from Launchpad at the moment,
83
14
      because we're doing feng shui in the server room.  Normal service will
84
15
      resume within an hour.
85
16
      </p>
86
17
      <p>We've recorded what happened. The error ID is:
87
18
        <tal:oops replace="structure view/oops_id_text" />
88
19
      </p>
89
20
      <tal:replace tal:replace="structure view/maybeShowTraceback" />
90
21
    </div>
91
22
  </body>
92
23
</html>
93
24
0
94
=== modified file 'lib/canonical/launchpad/zcml/launchpad.zcml'
95
--- lib/canonical/launchpad/zcml/launchpad.zcml	2010-09-20 16:45:03 +0000
96
+++ lib/canonical/launchpad/zcml/launchpad.zcml	2010-09-23 10:16:17 +0000
97
@@ -118,15 +118,6 @@
98
118
      class="canonical.launchpad.webapp.error.TranslationUnavailableView"
118
      class="canonical.launchpad.webapp.error.TranslationUnavailableView"
99
119
      />
119
      />
100
120
120
101
121
  <!-- LibrarianFailure -->
102
122
  <browser:page
103
123
      for="canonical.librarian.interfaces.LibrarianFailure"
104
124
      name="index.html"
105
125
      permission="zope.Public"
106
126
      template="../templates/launchpad-librarianfailure.pt"
107
127
      class="canonical.launchpad.webapp.error.SystemErrorView"
108
128
      />
109
129
110
130
  <!-- ReadOnlyModeViolation -->
121
  <!-- ReadOnlyModeViolation -->
111
131
  <browser:page
122
  <browser:page
112
132
      for="canonical.launchpad.webapp.interfaces.ReadOnlyModeViolation"
123
      for="canonical.launchpad.webapp.interfaces.ReadOnlyModeViolation"
Status:	Merged
Approved by:	Robert Collins on 2010-09-23
Approved revision:	no longer in the source branch.
Merged at revision:	11621
Proposed branch:	lp:~adeuring/launchpad/no-feng-shui-in-the-server-room
Merge into:	lp:launchpad
Diff against target:	112 lines (+0/-92) 3 files modified lib/canonical/launchpad/pagetests/standalone/xx-librarian-upload-errors.txt (+0/-60) lib/canonical/launchpad/templates/launchpad-librarianfailure.pt (+0/-23) lib/canonical/launchpad/zcml/launchpad.zcml (+0/-9)
To merge this branch:	bzr merge lp:~adeuring/launchpad/no-feng-shui-in-the-server-room
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Robert Collins (community)		2010-09-23	Approve on 2010-09-23
Review via email: mp+36427@code.launchpad.net