OpenStack Object Storage (swift)

Merge lp:~greglange/swift/lp715535 into lp:~hudson-openstack/swift/trunk

  1. lp715535
  2. Merge into trunk
Proposed by Greg Lange
Status: Merged
Approved by: gholt
Approved revision: 267
Merged at revision: 272
Proposed branch: lp:~greglange/swift/lp715535
Merge into: lp:~hudson-openstack/swift/trunk
Diff against target: 16 lines (+0/-6)
1 file modified
swift/common/wsgi.py (+0/-6)
To merge this branch: bzr merge lp:~greglange/swift/lp715535
Reviewer Review Type Date Requested Status
Swift Core security contacts Pending
Review via email: mp+57793@code.launchpad.net

Commit message

Remove ECONNRESET patch from proxy server

To post a comment you must log in.
Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (76.8 KiB)

The attempt to merge lp:~greglange/swift/lp715535 into lp:swift failed. Below is the output from the failed tests.

running test
running egg_info
creating swift.egg-info
writing swift.egg-info/PKG-INFO
writing top-level names to swift.egg-info/top_level.txt
writing dependency_links to swift.egg-info/dependency_links.txt
writing entry points to swift.egg-info/entry_points.txt
writing manifest file 'swift.egg-info/SOURCES.txt'
reading manifest file 'swift.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no files found matching 'ChangeLog'
writing manifest file 'swift.egg-info/SOURCES.txt'
running build_ext

UNABLE TO READ FUNCTIONAL TESTS CONFIG FILE
UNABLE TO READ FUNCTIONAL TESTS CONFIG FILE
SKIPPING FUNCTIONAL TESTS DUE TO NO CONFIG
testAccountHead (test.functional.tests.TestAccount) ... SKIP
testContainerListing (test.functional.tests.TestAccount) ... SKIP
testContainerSerializedInfo (test.functional.tests.TestAccount) ... SKIP
testContainersOrderedByName (test.functional.tests.TestAccount) ... SKIP
testInvalidAuthToken (test.functional.tests.TestAccount) ... SKIP
testInvalidPath (test.functional.tests.TestAccount) ... SKIP
testInvalidUTF8Path (test.functional.tests.TestAccount) ... SKIP
testLastContainerMarker (test.functional.tests.TestAccount) ... SKIP
testListingLimit (test.functional.tests.TestAccount) ... SKIP
testMarkerLimitContainerList (test.functional.tests.TestAccount) ... SKIP
testNoAuthToken (test.functional.tests.TestAccount) ... SKIP
testPUT (test.functional.tests.TestAccount) ... SKIP
testVersionOnlyPath (test.functional.tests.TestAccount) ... SKIP
testGetRequest (test.functional.tests.TestAccountNoContainers) ... SKIP
testGetRequest (test.functional.tests.TestAccountNoContainersUTF8) ... SKIP
testAccountHead (test.functional.tests.TestAccountUTF8) ... SKIP
testContainerListing (test.functional.tests.TestAccountUTF8) ... SKIP
testContainerSerializedInfo (test.functional.tests.TestAccountUTF8) ... SKIP
testContainersOrderedByName (test.functional.tests.TestAccountUTF8) ... SKIP
testInvalidAuthToken (test.functional.tests.TestAccountUTF8) ... SKIP
testInvalidPath (test.functional.tests.TestAccountUTF8) ... SKIP
testInvalidUTF8Path (test.functional.tests.TestAccountUTF8) ... SKIP
testLastContainerMarker (test.functional.tests.TestAccountUTF8) ... SKIP
testListingLimit (test.functional.tests.TestAccountUTF8) ... SKIP
testMarkerLimitContainerList (test.functional.tests.TestAccountUTF8) ... SKIP
testNoAuthToken (test.functional.tests.TestAccountUTF8) ... SKIP
testPUT (test.functional.tests.TestAccountUTF8) ... SKIP
testVersionOnlyPath (test.functional.tests.TestAccountUTF8) ... SKIP
testContainerExistenceCachingProblem (test.functional.tests.TestContainer) ... SKIP
testContainerFileList (test.functional.tests.TestContainer) ... SKIP
testContainerFileListOnContainerThatDoesNotExist (test.functional.tests.TestContainer) ... SKIP
testContainerFileListWithLimit (test.functional.tests.TestContainer) ... SKIP
testContainerInfo (test.functional.tests.TestContainer) ... SKIP
testContainerInfoOnContainerThatDoesNotExist (test.functional.tests.TestContainer) ... SKIP
testContainerNameLimit (test.functional.tests.TestCo...

Revision history for this message
David Goetz (david-goetz) wrote :

umm- could this be because hudson has a really old copy of eventlet? who has access to that box?

Revision history for this message
gholt (gholt) wrote :

It could also have been that the merge had neither a commit message nor description.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'swift/common/wsgi.py'
2--- swift/common/wsgi.py 2011-02-14 23:02:08 +0000
3+++ swift/common/wsgi.py 2011-04-14 22:35:52 +0000
4@@ -25,12 +25,6 @@
5 import eventlet
6 from eventlet import greenio, GreenPool, sleep, wsgi, listen
7 from paste.deploy import loadapp, appconfig
8-
9-# Hook to ensure connection resets don't blow up our servers.
10-# Remove with next release of Eventlet that has it in the set already.
11-from errno import ECONNRESET
12-wsgi.ACCEPT_ERRNO.add(ECONNRESET)
13-
14 from eventlet.green import socket, ssl
15
16 from swift.common.utils import get_logger, drop_privileges, \