x/slogging
Code Issues Proposed changes

fixed tests

Browse Source
This commit is contained in:
John Dickinson 2012-04-10 15:42:01 -05:00
parent f03370721e
commit 46f0b3962e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test_slogging/unit/test_log_common.py
View File

@ -58,8 +58,8 @@ class DumbInternalProxy(object):
class TestLogProcessor(unittest.TestCase): class TestLogProcessor(unittest.TestCase):
proxy_config = {'log-processor': {}, proxy_config = {'log-processor': {
'swift_account': 'foo' '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 '\

6
test_slogging/unit/test_log_processor.py
View File

@ -92,9 +92,9 @@ class TestLogProcessor(unittest.TestCase):
'6 95 - txfa431231-7f07-42fd-8fc7-7da9d8cc1f90 - 0.0262' '6 95 - txfa431231-7f07-42fd-8fc7-7da9d8cc1f90 - 0.0262'
stats_test_line = 'account,1,2,3' stats_test_line = 'account,1,2,3'
proxy_config = {'log-processor': { proxy_config = {'log-processor': {
},
'swift_account': 'foo' 'swift_account': 'foo'
} }
}
def test_lazy_load_internal_proxy(self): def test_lazy_load_internal_proxy(self):
# stub out internal_proxy's upload_app # stub out internal_proxy's upload_app
@ -105,9 +105,9 @@ use = egg:swift#proxy
with tmpfile(dummy_proxy_config) as proxy_config_file: with tmpfile(dummy_proxy_config) as proxy_config_file:
conf = {'log-processor': { conf = {'log-processor': {
'proxy_server_conf': proxy_config_file, 'proxy_server_conf': proxy_config_file,
},
'swift_account': 'foo' 'swift_account': 'foo'
} }
}
p = log_processor.LogProcessor(conf, DumbLogger()) p = log_processor.LogProcessor(conf, DumbLogger())
self.assert_(isinstance(p._internal_proxy, self.assert_(isinstance(p._internal_proxy,
None.__class__)) None.__class__))
@ -117,9 +117,9 @@ use = egg:swift#proxy
# test with empty config variable # test with empty config variable
conf = {'log-processor': { conf = {'log-processor': {
'proxy_server_conf': '', 'proxy_server_conf': '',
},
'swift_account': 'foo' 'swift_account': 'foo'
} }
}
q = log_processor.LogProcessor(conf, DumbLogger()) q = log_processor.LogProcessor(conf, DumbLogger())
self.assert_(isinstance(q._internal_proxy, self.assert_(isinstance(q._internal_proxy,
None.__class__)) None.__class__))