openstack/swift
Code Issues Proposed changes

Fixed a failing test on my saio

Browse Source 
The added sleep makes this test pass on my saio. I have not heard of
it failing for anyone else, but I figured I'd post this up just in
case someone does have the same problem and this fixes it for them.

Change-Id: Ia0bb09d36d0b531ade7c6a6034bbe31dd6c90a98
This commit is contained in:
gholt 2013-12-05 18:02:06 +00:00
parent 30c0c086f9
commit b332e3e436
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/unit/proxy/test_server.py
View File

@ -4655,7 +4655,10 @@ class TestObjectController(unittest.TestCase):
# Remember Request instance count, make sure the GC is run for pythons # Remember Request instance count, make sure the GC is run for pythons
# without reference counting. # without reference counting.
for i in xrange(4): for i in xrange(4):
sleep(0) # let eventlet do its thing
gc.collect() gc.collect()
else:
sleep(0)
before_request_instances = len(_request_instances) before_request_instances = len(_request_instances)
# GET test file, but disconnect early # GET test file, but disconnect early
sock = connect_tcp(('localhost', prolis.getsockname()[1])) sock = connect_tcp(('localhost', prolis.getsockname()[1]))
@ -4672,10 +4675,12 @@ class TestObjectController(unittest.TestCase):
fd.read(1) fd.read(1)
fd.close() fd.close()
sock.close() sock.close()
sleep(0) # let eventlet do it's thing
# Make sure the GC is run again for pythons without reference counting # Make sure the GC is run again for pythons without reference counting
for i in xrange(4): for i in xrange(4):
sleep(0) # let eventlet do its thing
gc.collect() gc.collect()
else:
sleep(0)
self.assertEquals(before_request_instances, len(_request_instances)) self.assertEquals(before_request_instances, len(_request_instances))
def test_OPTIONS(self): def test_OPTIONS(self):