x/slogging
Code Issues Proposed changes

fixed tests

Browse Source
This commit is contained in:
John Dickinson 2012-03-02 16:13:49 -06:00
parent 4903e57821
commit 6784a98717
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test_slogging/unit/test_access_log_delivery.py
View File

@ -63,9 +63,10 @@ class FakeMemcache(object):
class TestAccessLogDelivery(unittest.TestCase): class TestAccessLogDelivery(unittest.TestCase):
conf = {'swift_account': 'foo'}
def test_log_line_parser_query_args(self): def test_log_line_parser_query_args(self):
c = {'swift_account': 'foo'} p = access_log_delivery.AccessLogDelivery(self.conf, DumbLogger())
p = access_log_delivery.AccessLogDelivery(c, DumbLogger())
log_line = [str(x) for x in range(18)] log_line = [str(x) for x in range(18)]
log_line[1] = 'proxy-server' log_line[1] = 'proxy-server'
log_line[4] = '1/Jan/3/4/5/6' log_line[4] = '1/Jan/3/4/5/6'
@ -105,8 +106,7 @@ class TestAccessLogDelivery(unittest.TestCase):
self.assertEquals(res['client_ip'], expected) self.assertEquals(res['client_ip'], expected)
def test_log_line_parser_field_count(self): def test_log_line_parser_field_count(self):
c = {'swift_account': 'foo'} p = access_log_delivery.AccessLogDelivery(self.conf, DumbLogger())
p = access_log_delivery.AccessLogDelivery(c, DumbLogger())
# too few fields # too few fields
log_line = [str(x) for x in range(17)] log_line = [str(x) for x in range(17)]
log_line[1] = 'proxy-server' log_line[1] = 'proxy-server'
@ -150,8 +150,7 @@ class TestAccessLogDelivery(unittest.TestCase):
self.assertEquals(res, expected) self.assertEquals(res, expected)
def test_make_clf_from_parts(self): def test_make_clf_from_parts(self):
c = {'swift_account': 'foo'} p = access_log_delivery.AccessLogDelivery(self.conf, DumbLogger())
p = access_log_delivery.AccessLogDelivery(c, DumbLogger())
log_line = [str(x) for x in range(18)] log_line = [str(x) for x in range(18)]
log_line[1] = 'proxy-server' log_line[1] = 'proxy-server'
log_line[4] = '1/Jan/3/4/5/6' log_line[4] = '1/Jan/3/4/5/6'
@ -163,8 +162,7 @@ class TestAccessLogDelivery(unittest.TestCase):
self.assertEquals(clf, expect) self.assertEquals(clf, expect)
def test_convert_log_line(self): def test_convert_log_line(self):
c = {'swift_account': 'foo'} p = access_log_delivery.AccessLogDelivery(self.conf, DumbLogger())
p = access_log_delivery.AccessLogDelivery(c, DumbLogger())
log_line = [str(x) for x in range(18)] log_line = [str(x) for x in range(18)]
log_line[1] = 'proxy-server' log_line[1] = 'proxy-server'
log_line[4] = '1/Jan/3/4/5/6' log_line[4] = '1/Jan/3/4/5/6'
@ -178,8 +176,7 @@ class TestAccessLogDelivery(unittest.TestCase):
self.assertEquals(res, expected) self.assertEquals(res, expected)
def test_get_container_save_log_flag(self): def test_get_container_save_log_flag(self):
c = {'swift_account': 'foo'} p = access_log_delivery.AccessLogDelivery(self.conf, DumbLogger())
p = access_log_delivery.AccessLogDelivery(c, DumbLogger())
def my_get_metadata_true(*a, **kw): def my_get_metadata_true(*a, **kw):
return {p.metadata_key: 'yes'} return {p.metadata_key: 'yes'}

5
test_slogging/unit/test_log_common.py
View File

@ -58,9 +58,8 @@ class DumbInternalProxy(object):
class TestLogProcessor(unittest.TestCase): class TestLogProcessor(unittest.TestCase):
proxy_config = {'log-processor': { proxy_config = {'log-processor': {},
'swift_account': 'foo'
}
} }
access_test_line = 'Jul 9 04:14:30 saio proxy-server 1.2.3.4 4.5.6.7 '\ access_test_line = 'Jul 9 04:14:30 saio proxy-server 1.2.3.4 4.5.6.7 '\
'09/Jul/2010/04/14/30 GET '\ '09/Jul/2010/04/14/30 GET '\