Merge "Disable proxy in unit test case of test_bin"
This commit is contained in:
@@ -156,7 +156,7 @@ class BinApiTestCase(base.BaseTestCase):
|
|||||||
|
|
||||||
# create ceilometer.conf file
|
# create ceilometer.conf file
|
||||||
self.api_port = random.randint(10000, 11000)
|
self.api_port = random.randint(10000, 11000)
|
||||||
self.http = httplib2.Http()
|
self.http = httplib2.Http(proxy_info=None)
|
||||||
pipeline_cfg_file = self.path_get('etc/ceilometer/pipeline.yaml')
|
pipeline_cfg_file = self.path_get('etc/ceilometer/pipeline.yaml')
|
||||||
policy_file = self.path_get('etc/ceilometer/policy.json')
|
policy_file = self.path_get('etc/ceilometer/policy.json')
|
||||||
content = ("[DEFAULT]\n"
|
content = ("[DEFAULT]\n"
|
||||||
|
|||||||
Reference in New Issue
Block a user