From 46f0b3962e8b6aad879b3c543f110974bf80868f Mon Sep 17 00:00:00 2001 From: John Dickinson Date: Tue, 10 Apr 2012 15:42:01 -0500 Subject: [PATCH] fixed tests --- test_slogging/unit/test_log_common.py | 4 ++-- test_slogging/unit/test_log_processor.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test_slogging/unit/test_log_common.py b/test_slogging/unit/test_log_common.py index ff9985f..6c71869 100644 --- a/test_slogging/unit/test_log_common.py +++ b/test_slogging/unit/test_log_common.py @@ -58,8 +58,8 @@ class DumbInternalProxy(object): class TestLogProcessor(unittest.TestCase): - proxy_config = {'log-processor': {}, - 'swift_account': 'foo' + 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 '\ '09/Jul/2010/04/14/30 GET '\ diff --git a/test_slogging/unit/test_log_processor.py b/test_slogging/unit/test_log_processor.py index 7a07b6a..1b588e0 100644 --- a/test_slogging/unit/test_log_processor.py +++ b/test_slogging/unit/test_log_processor.py @@ -92,8 +92,8 @@ class TestLogProcessor(unittest.TestCase): '6 95 - txfa431231-7f07-42fd-8fc7-7da9d8cc1f90 - 0.0262' stats_test_line = 'account,1,2,3' proxy_config = {'log-processor': { - }, 'swift_account': 'foo' + } } def test_lazy_load_internal_proxy(self): @@ -105,8 +105,8 @@ use = egg:swift#proxy with tmpfile(dummy_proxy_config) as proxy_config_file: conf = {'log-processor': { 'proxy_server_conf': proxy_config_file, - }, - 'swift_account': 'foo' + 'swift_account': 'foo' + } } p = log_processor.LogProcessor(conf, DumbLogger()) self.assert_(isinstance(p._internal_proxy, @@ -117,8 +117,8 @@ use = egg:swift#proxy # test with empty config variable conf = {'log-processor': { 'proxy_server_conf': '', - }, - 'swift_account': 'foo' + 'swift_account': 'foo' + } } q = log_processor.LogProcessor(conf, DumbLogger()) self.assert_(isinstance(q._internal_proxy,