openstack
/
os-loganalyze
Code Issues Proposed changes

Fix swiftclient tests 

We were not properly faking out swiftclient which lead to swift tests
passing without ever running through the swift generator code. Properly
monkey patch swiftclient so that we can test this code.

Change-Id: Ie7701cebb4c4e8ffc1289421df9c136c7de3f008
This commit is contained in:
Clark Boylan 2015-04-02 18:02:03 -07:00
parent f536d3ef9c
commit d3b7649a6f
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
os_loganalyze/tests/base.py
View File

@ -83,7 +83,8 @@ class TestCase(testtools.TestCase):
def get_generator(self, fname, level=None, html=True,
limit=None, source=None):
kwargs = {'PATH_INFO': '/htmlify/samples/%s' % fname}
kwargs = {'PATH_INFO': '/htmlify/%s/%s' % (self.samples_directory,
fname)}
qs = {}
if level:
qs['level'] = level

35
os_loganalyze/tests/test_wsgi.py
View File

@ -20,7 +20,8 @@ Test the ability to convert files into wsgi generators
import types
import swiftclient
import fixtures
import swiftclient # noqa needed for monkeypatching
from os_loganalyze.tests import base
import os_loganalyze.wsgi as log_wsgi
@ -165,24 +166,30 @@ class TestWsgiDisk(base.TestCase):
class TestWsgiSwift(TestWsgiDisk):
"""Test loading files from swift."""
def setUp(self):
def fake_get_object(self, container, name, resp_chunk_size=None):
if resp_chunk_size:
class fake_swiftclient(object):
def __init__(self, *args, **kwargs):
pass
def _object_body():
with open(base.samples_path('samples') + name) as f:
def get_object(self, container, name, resp_chunk_size=None):
name = name[len('non-existent'):]
if resp_chunk_size:
def _object_body():
with open(base.samples_path('samples') + name) as f:
buf = f.read(resp_chunk_size)
while buf:
yield buf
buf = f.read(resp_chunk_size)
while buf:
yield buf
buf = f.read(resp_chunk_size)
object_body = _object_body()
else:
with open(base.samples_path('samples') + name) as f:
object_body = f.read()
return [], object_body
object_body = _object_body()
else:
with open(base.samples_path('samples') + name) as f:
object_body = f.read()
return [], object_body
swiftclient.client.Connection.get_object = fake_get_object
self.useFixture(fixtures.MonkeyPatch(
'swiftclient.client.Connection', fake_swiftclient))
super(TestWsgiSwift, self).setUp()
# Set the samples directory to somewhere non-existent so that swift