openstack
/
freezer-api
Code Issues Proposed changes

Merge "Fix freezer-db-init when no config file is found"

This commit is contained in:
Jenkins 2015-11-13 15:22:26 +00:00 committed by Gerrit Code Review
parent 7ca26cbd3a ddc4e19f44
commit ae40d33561
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freezer_api/cmd/db_init.py
View File

@ -271,7 +271,7 @@ def parse_config_file(fname):
:return: (host, port, db_index, number_of_replicas)
"""
if not fname:
return None, 0, None
return None, 0, None, 0
host, port, index, number_of_replicas = None, 0, None, 0

7
tests/test_db_init.py
View File

@ -363,6 +363,13 @@ class TestDbInit(unittest.TestCase):
self.assertEquals(index, 'ohyes')
self.assertEquals(replicas, 10)
def test_parse_config_file_return_False_values_when_no_config_fname(self):
host, port, index, replicas = parse_config_file(None)
self.assertEquals(host, None)
self.assertEquals(port, 0)
self.assertEquals(index, None)
self.assertEquals(replicas, 0)
@patch('freezer_api.cmd.db_init.parse_config_file')
def test_get_db_params_returns_args_parameters(self, mock_parse_config_file):
mock_parse_config_file.return_value = (None, None, None, None )