From ddc4e19f447b7a527b58f21b2cc0b949c2898098 Mon Sep 17 00:00:00 2001 From: Fabrizio Vanni Date: Tue, 10 Nov 2015 15:15:36 +0000 Subject: [PATCH] Fix freezer-db-init when no config file is found The freezer-db-init script was exiting with error when the freezer-api configuration file was not found. This is now fixed and the script correctly uses default values. Change-Id: I1789aa2c4bd72378b11db602fce68ded2d29e974 --- freezer_api/cmd/db_init.py | 2 +- tests/test_db_init.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/freezer_api/cmd/db_init.py b/freezer_api/cmd/db_init.py index 3230d058..f1a7d601 100755 --- a/freezer_api/cmd/db_init.py +++ b/freezer_api/cmd/db_init.py @@ -236,7 +236,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 diff --git a/tests/test_db_init.py b/tests/test_db_init.py index 98428f53..2bd1e30f 100644 --- a/tests/test_db_init.py +++ b/tests/test_db_init.py @@ -271,6 +271,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 )