openstack/swift
Code Issues Proposed changes

Always check for unexpected requests in mocked_http_conn

Browse Source 
Change-Id: Ie0ea9971129b6d090a0fcb7c5be33acb6c9b512d
Related-Change: Ia72c407247e4525ef071a1728750850807ae8231
This commit is contained in:
Tim Burke 2017-05-01 12:06:40 -07:00
parent bf09a06708
commit 6f55a5ea94
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/unit/__init__.py
View File

@ -1097,6 +1097,9 @@ def mocked_http_conn(*args, **kwargs):
left_over_status = list(fake_conn.code_iter) left_over_status = list(fake_conn.code_iter)
if left_over_status: if left_over_status:
raise AssertionError('left over status %r' % left_over_status) raise AssertionError('left over status %r' % left_over_status)
if fake_conn.unexpected_requests:
raise AssertionError('unexpected requests %r' %
fake_conn.unexpected_requests)
def make_timestamp_iter(offset=0): def make_timestamp_iter(offset=0):

24
test/unit/proxy/controllers/test_container.py
View File

@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
import mock import mock
import socket
import unittest import unittest
from eventlet import Timeout from eventlet import Timeout
@ -193,34 +194,32 @@ class TestContainerController(TestRingBase):
self.assertEqual(req['method'], method) self.assertEqual(req['method'], method)
self.assertTrue(req['path'].endswith('/a/c')) self.assertTrue(req['path'].endswith('/a/c'))
base_status = [201] * 3 base_status = [201] * self.CONTAINER_REPLICAS
# test happy path # test happy path
test_status_map(list(base_status), 201) test_status_map(list(base_status), 201)
for i in range(3): for i in range(self.CONTAINER_REPLICAS):
self.assertEqual(node_error_count( self.assertEqual(node_error_count(
self.app, self.container_ring.devs[i]), 0) self.app, self.container_ring.devs[i]), 0)
# single node errors and test isolation # single node errors and test isolation
for i in range(3): for i in range(self.CONTAINER_REPLICAS):
status_list = list(base_status) test_status_map(base_status[:i] + [503] + base_status[i:], 201)
status_list[i] = 503 for j in range(self.CONTAINER_REPLICAS):
status_list.append(201)
test_status_map(status_list, 201)
for j in range(3):
expected = 1 if j == i else 0 expected = 1 if j == i else 0
self.assertEqual(node_error_count( self.assertEqual(node_error_count(
self.app, self.container_ring.devs[j]), expected) self.app, self.container_ring.devs[j]), expected)
# timeout # timeout
test_status_map((201, Timeout(), 201, 201), 201) test_status_map(base_status[:1] + [Timeout()] + base_status[1:],
201)
self.assertEqual(node_error_count( self.assertEqual(node_error_count(
self.app, self.container_ring.devs[1]), 1) self.app, self.container_ring.devs[1]), 1)
# exception # exception
test_status_map((Exception('kaboom!'), 201, 201, 201), 201) test_status_map([Exception('kaboom!')] + base_status, 201)
self.assertEqual(node_error_count( self.assertEqual(node_error_count(
self.app, self.container_ring.devs[0]), 1) self.app, self.container_ring.devs[0]), 1)
# insufficient storage # insufficient storage
test_status_map((201, 201, 507, 201), 201) test_status_map(base_status[:2] + [507] + base_status[2:], 201)
self.assertEqual(node_error_count( self.assertEqual(node_error_count(
self.app, self.container_ring.devs[2]), self.app, self.container_ring.devs[2]),
self.app.error_suppression_limit + 1) self.app.error_suppression_limit + 1)
@ -229,7 +228,8 @@ class TestContainerController(TestRingBase):
nodes = self.app.container_ring.replicas nodes = self.app.container_ring.replicas
handoffs = self.app.request_node_count(nodes) - nodes handoffs = self.app.request_node_count(nodes) - nodes
GET_TEST_CASES = [ GET_TEST_CASES = [
([], 503), ([socket.error()] * (nodes + handoffs), 503),
([500] * (nodes + handoffs), 503),
([200], 200), ([200], 200),
([404, 200], 200), ([404, 200], 200),
([404] * nodes + [200], 200), ([404] * nodes + [200], 200),