fixing the tests, so in the absence of iptools, no explosions. Also exporting the variable CIDR_support incase anywhere else needs to know about iptools or not
This commit is contained in:
parent
098545a2cd
commit
9ad12d2259
@ -21,11 +21,14 @@ import copy
|
|||||||
# is present in the system. Without iptools, you will lack CIDR support.
|
# is present in the system. Without iptools, you will lack CIDR support.
|
||||||
try:
|
try:
|
||||||
from iptools import IpRangeList
|
from iptools import IpRangeList
|
||||||
|
CIDR_support = True
|
||||||
|
|
||||||
def return_ips(conf, conf_tag):
|
def return_ips(conf, conf_tag):
|
||||||
return IpRangeList(*[x.strip() for x in
|
return IpRangeList(*[x.strip() for x in
|
||||||
conf.get(conf_tag, '').split(',') if x.strip()])
|
conf.get(conf_tag, '').split(',') if x.strip()])
|
||||||
except:
|
except ImportError:
|
||||||
|
CIDR_support = False
|
||||||
|
|
||||||
def return_ips(conf, conf_tag):
|
def return_ips(conf, conf_tag):
|
||||||
return ([x.strip() for x in conf.get(conf_tag, '').split(',')
|
return ([x.strip() for x in conf.get(conf_tag, '').split(',')
|
||||||
if x.strip()])
|
if x.strip()])
|
||||||
|
@ -22,11 +22,15 @@ from slogging import access_processor
|
|||||||
class TestAccessProcessor(unittest.TestCase):
|
class TestAccessProcessor(unittest.TestCase):
|
||||||
|
|
||||||
def test_CIDR_works(self):
|
def test_CIDR_works(self):
|
||||||
|
if access_processor.CIDR_support:
|
||||||
p = access_processor.AccessLogProcessor({'lb_private_ips':
|
p = access_processor.AccessLogProcessor({'lb_private_ips':
|
||||||
'127.0.0.1,192.168/16,10/24'})
|
'127.0.0.1,192.168/16,10/24'})
|
||||||
self.assertTrue('192.168.2.3' in p.lb_private_ips)
|
self.assertTrue('192.168.2.3' in p.lb_private_ips)
|
||||||
self.assertTrue('127.0.0.1' in p.lb_private_ips)
|
self.assertTrue('127.0.0.1' in p.lb_private_ips)
|
||||||
self.assertFalse('192.167.2.3' in p.lb_private_ips)
|
self.assertFalse('192.167.2.3' in p.lb_private_ips)
|
||||||
|
else:
|
||||||
|
from nose import SkipTest
|
||||||
|
return SkipTest("iptools for CIDR support not installed")
|
||||||
|
|
||||||
def test_log_line_parser_query_args(self):
|
def test_log_line_parser_query_args(self):
|
||||||
p = access_processor.AccessLogProcessor({})
|
p = access_processor.AccessLogProcessor({})
|
||||||
|
Loading…
Reference in New Issue
Block a user