x/slogging
Code Issues Proposed changes

updated to use Application instead of BaseApplication

Browse Source 
this reflects the changes in the swift codebase
This commit is contained in:
John Dickinson 2012-09-19 22:47:39 -07:00
parent 4cc56cde85
commit d4eab57ba1
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slogging/internal_proxy.py
View File

@ -19,7 +19,7 @@ from json import loads as json_loads
import copy
from slogging.compressing_file_reader import CompressingFileReader
from swift.proxy.server import BaseApplication
from swift.proxy.server import Application
def make_request_body_file(source_file, compress=True):
@ -55,7 +55,7 @@ class InternalProxy(object):
def __init__(self, proxy_server_conf=None, logger=None, retries=0,
memcache=None):
self.upload_app = BaseApplication(proxy_server_conf, memcache=memcache,
self.upload_app = Application(proxy_server_conf, memcache=memcache,
logger=logger)
self.retries = retries

28
test_slogging/unit/test_internal_proxy.py
View File

@ -23,14 +23,14 @@ import json
from slogging import internal_proxy
class DumbBaseApplicationFactory(object):
class DumbApplicationFactory(object):
def __init__(self, status_codes, body=''):
self.status_codes = status_codes[:]
self.body = body
def __call__(self, *a, **kw):
app = DumbBaseApplication(*a, **kw)
app = DumbApplication(*a, **kw)
app.status_codes = self.status_codes
try:
app.default_status_code = self.status_codes[-1]
@ -40,7 +40,7 @@ class DumbBaseApplicationFactory(object):
return app
class DumbBaseApplication(object):
class DumbApplication(object):
def __init__(self, *a, **kw):
self.status_codes = []
@ -83,7 +83,7 @@ class TestInternalProxy(unittest.TestCase):
def test_handle_request(self):
status_codes = [200]
internal_proxy.BaseApplication = DumbBaseApplicationFactory(
internal_proxy.Application = DumbApplicationFactory(
status_codes)
p = internal_proxy.InternalProxy()
req = webob.Request.blank('/')
@ -93,7 +93,7 @@ class TestInternalProxy(unittest.TestCase):
def test_handle_request_with_retries(self):
status_codes = [500, 200]
internal_proxy.BaseApplication = DumbBaseApplicationFactory(
internal_proxy.Application = DumbApplicationFactory(
status_codes)
p = internal_proxy.InternalProxy(retries=3)
req = webob.Request.blank('/')
@ -105,7 +105,7 @@ class TestInternalProxy(unittest.TestCase):
def test_get_object(self):
status_codes = [200]
internal_proxy.BaseApplication = DumbBaseApplicationFactory(
internal_proxy.Application = DumbApplicationFactory(
status_codes)
p = internal_proxy.InternalProxy()
code, body = p.get_object('a', 'c', 'o')
@ -115,7 +115,7 @@ class TestInternalProxy(unittest.TestCase):
def test_create_container(self):
status_codes = [200]
internal_proxy.BaseApplication = DumbBaseApplicationFactory(
internal_proxy.Application = DumbApplicationFactory(
status_codes)
p = internal_proxy.InternalProxy()
resp = p.create_container('a', 'c')
@ -123,7 +123,7 @@ class TestInternalProxy(unittest.TestCase):
def test_handle_request_with_retries_all_error(self):
status_codes = [500, 500, 500, 500, 500]
internal_proxy.BaseApplication = DumbBaseApplicationFactory(
internal_proxy.Application = DumbApplicationFactory(
status_codes)
p = internal_proxy.InternalProxy(retries=3)
req = webob.Request.blank('/')
@ -135,7 +135,7 @@ class TestInternalProxy(unittest.TestCase):
def test_get_container_list_empty(self):
status_codes = [200]
internal_proxy.BaseApplication = DumbBaseApplicationFactory(
internal_proxy.Application = DumbApplicationFactory(
status_codes, body='[]')
p = internal_proxy.InternalProxy()
resp = p.get_container_list('a', 'c')
@ -143,7 +143,7 @@ class TestInternalProxy(unittest.TestCase):
def test_get_container_list_no_body(self):
status_codes = [204]
internal_proxy.BaseApplication = DumbBaseApplicationFactory(
internal_proxy.Application = DumbApplicationFactory(
status_codes, body='')
p = internal_proxy.InternalProxy()
resp = p.get_container_list('a', 'c')
@ -156,7 +156,7 @@ class TestInternalProxy(unittest.TestCase):
obj_b = dict(name='bar', hash='bar', bytes=3,
content_type='text/plain', last_modified='2011/01/01')
body = [json.dumps([obj_a]), json.dumps([obj_b]), json.dumps([])]
internal_proxy.BaseApplication = DumbBaseApplicationFactory(
internal_proxy.Application = DumbApplicationFactory(
status_codes, body=body)
p = internal_proxy.InternalProxy()
resp = p.get_container_list('a', 'c')
@ -165,7 +165,7 @@ class TestInternalProxy(unittest.TestCase):
def test_get_container_list_full(self):
status_codes = [204]
internal_proxy.BaseApplication = DumbBaseApplicationFactory(
internal_proxy.Application = DumbApplicationFactory(
status_codes, body='')
p = internal_proxy.InternalProxy()
resp = p.get_container_list('a', 'c', marker='a', end_marker='b',
@ -174,7 +174,7 @@ class TestInternalProxy(unittest.TestCase):
def test_upload_file(self):
status_codes = [200, 200] # container PUT + object PUT
internal_proxy.BaseApplication = DumbBaseApplicationFactory(
internal_proxy.Application = DumbApplicationFactory(
status_codes)
p = internal_proxy.InternalProxy()
with tempfile.NamedTemporaryFile() as file_obj:
@ -183,7 +183,7 @@ class TestInternalProxy(unittest.TestCase):
def test_upload_file_with_retries(self):
status_codes = [200, 500, 200] # container PUT + error + object PUT
internal_proxy.BaseApplication = DumbBaseApplicationFactory(
internal_proxy.Application = DumbApplicationFactory(
status_codes)
p = internal_proxy.InternalProxy(retries=3)
with tempfile.NamedTemporaryFile() as file_obj:

2
test_slogging/unit/test_log_processor.py
View File

@ -98,7 +98,7 @@ class TestLogProcessor(unittest.TestCase):
def test_lazy_load_internal_proxy(self):
# stub out internal_proxy's upload_app
internal_proxy.BaseApplication = FakeUploadApp
internal_proxy.Application = FakeUploadApp
dummy_proxy_config = """[app:proxy-server]
use = egg:swift#proxy
"""