updated tests
This commit is contained in:
parent
3127f365f9
commit
c80e63466d
|
@ -1,4 +1,5 @@
|
|||
import os
|
||||
import collections
|
||||
from swift.common.utils import lock_file
|
||||
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
import multiprocessing
|
||||
import Queue
|
||||
import datetime
|
||||
from datetime import datetime, timedelta
|
||||
import zlib
|
||||
import time
|
||||
from paste.deploy import appconfig
|
||||
|
@ -93,16 +93,14 @@ class LogProcessorCommon(object):
|
|||
lookback_start = None
|
||||
lookback_end = None
|
||||
else:
|
||||
delta_hours = datetime.timedelta(hours=self.lookback_hours)
|
||||
lookback_start = datetime.datetime.now() - delta_hours
|
||||
delta_hours = timedelta(hours=self.lookback_hours)
|
||||
lookback_start = datetime.now() - delta_hours
|
||||
lookback_start = lookback_start.strftime('%Y%m%d%H')
|
||||
if self.lookback_window == 0:
|
||||
lookback_end = None
|
||||
else:
|
||||
delta_window = datetime.timedelta(hours=self.lookback_window)
|
||||
lookback_end = datetime.datetime.now() - \
|
||||
delta_hours + \
|
||||
delta_window
|
||||
delta_window = timedelta(hours=self.lookback_window)
|
||||
lookback_end = datetime.now() - delta_hours + delta_window
|
||||
lookback_end = lookback_end.strftime('%Y%m%d%H')
|
||||
self.logger.debug('lookback_start: %s' % lookback_start)
|
||||
self.logger.debug('lookback_end: %s' % lookback_end)
|
||||
|
|
|
@ -64,7 +64,8 @@ class FakeMemcache(object):
|
|||
class TestAccessLogDelivery(unittest.TestCase):
|
||||
|
||||
def test_log_line_parser_query_args(self):
|
||||
p = access_log_delivery.AccessLogDelivery({}, DumbLogger())
|
||||
c = {'swift_account': 'foo'}
|
||||
p = access_log_delivery.AccessLogDelivery(c, DumbLogger())
|
||||
log_line = [str(x) for x in range(18)]
|
||||
log_line[1] = 'proxy-server'
|
||||
log_line[4] = '1/Jan/3/4/5/6'
|
||||
|
@ -82,7 +83,7 @@ class TestAccessLogDelivery(unittest.TestCase):
|
|||
self.assertEquals(res, expected)
|
||||
|
||||
def test_log_line_parser_hidden_ip(self):
|
||||
conf = {'hidden_ips': '1.2.3.4'}
|
||||
conf = {'hidden_ips': '1.2.3.4', 'swift_account': 'foo'}
|
||||
p = access_log_delivery.AccessLogDelivery(conf, DumbLogger())
|
||||
log_line = [str(x) for x in range(18)]
|
||||
log_line[1] = 'proxy-server'
|
||||
|
@ -104,7 +105,8 @@ class TestAccessLogDelivery(unittest.TestCase):
|
|||
self.assertEquals(res['client_ip'], expected)
|
||||
|
||||
def test_log_line_parser_field_count(self):
|
||||
p = access_log_delivery.AccessLogDelivery({}, DumbLogger())
|
||||
c = {'swift_account': 'foo'}
|
||||
p = access_log_delivery.AccessLogDelivery(c, DumbLogger())
|
||||
# too few fields
|
||||
log_line = [str(x) for x in range(17)]
|
||||
log_line[1] = 'proxy-server'
|
||||
|
@ -148,7 +150,8 @@ class TestAccessLogDelivery(unittest.TestCase):
|
|||
self.assertEquals(res, expected)
|
||||
|
||||
def test_make_clf_from_parts(self):
|
||||
p = access_log_delivery.AccessLogDelivery({}, DumbLogger())
|
||||
c = {'swift_account': 'foo'}
|
||||
p = access_log_delivery.AccessLogDelivery(c, DumbLogger())
|
||||
log_line = [str(x) for x in range(18)]
|
||||
log_line[1] = 'proxy-server'
|
||||
log_line[4] = '1/Jan/3/4/5/6'
|
||||
|
@ -160,7 +163,8 @@ class TestAccessLogDelivery(unittest.TestCase):
|
|||
self.assertEquals(clf, expect)
|
||||
|
||||
def test_convert_log_line(self):
|
||||
p = access_log_delivery.AccessLogDelivery({}, DumbLogger())
|
||||
c = {'swift_account': 'foo'}
|
||||
p = access_log_delivery.AccessLogDelivery(c, DumbLogger())
|
||||
log_line = [str(x) for x in range(18)]
|
||||
log_line[1] = 'proxy-server'
|
||||
log_line[4] = '1/Jan/3/4/5/6'
|
||||
|
@ -174,7 +178,8 @@ class TestAccessLogDelivery(unittest.TestCase):
|
|||
self.assertEquals(res, expected)
|
||||
|
||||
def test_get_container_save_log_flag(self):
|
||||
p = access_log_delivery.AccessLogDelivery({}, DumbLogger())
|
||||
c = {'swift_account': 'foo'}
|
||||
p = access_log_delivery.AccessLogDelivery(c, DumbLogger())
|
||||
|
||||
def my_get_metadata_true(*a, **kw):
|
||||
return {p.metadata_key: 'yes'}
|
||||
|
@ -202,7 +207,7 @@ class TestAccessLogDelivery(unittest.TestCase):
|
|||
|
||||
def test_process_one_file(self):
|
||||
with temptree([]) as t:
|
||||
conf = {'working_dir': t}
|
||||
conf = {'working_dir': t, 'swift_account': 'foo'}
|
||||
p = access_log_delivery.AccessLogDelivery(conf, DumbLogger())
|
||||
|
||||
def my_get_object_data(*a, **kw):
|
||||
|
|
|
@ -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,7 +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'
|
||||
}
|
||||
p = log_processor.LogProcessor(conf, DumbLogger())
|
||||
self.assert_(isinstance(p._internal_proxy,
|
||||
|
@ -116,7 +117,8 @@ use = egg:swift#proxy
|
|||
# test with empty config variable
|
||||
conf = {'log-processor': {
|
||||
'proxy_server_conf': '',
|
||||
}
|
||||
},
|
||||
'swift_account': 'foo'
|
||||
}
|
||||
q = log_processor.LogProcessor(conf, DumbLogger())
|
||||
self.assert_(isinstance(q._internal_proxy,
|
||||
|
|
Loading…
Reference in New Issue