From d72b8a91c065b3573b87340c6b5b607ccd887d91 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Mon, 4 Dec 2017 08:21:29 -0500 Subject: [PATCH] ceph-volume tests verify that INI comments can be inlined Signed-off-by: Alfredo Deza --- .../ceph_volume/tests/test_configuration.py | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/ceph-volume/ceph_volume/tests/test_configuration.py b/src/ceph-volume/ceph_volume/tests/test_configuration.py index 51ead952291f..0009532c44ef 100644 --- a/src/ceph-volume/ceph_volume/tests/test_configuration.py +++ b/src/ceph-volume/ceph_volume/tests/test_configuration.py @@ -10,6 +10,10 @@ from ceph_volume import configuration, exceptions tabbed_conf = """ [global] default = 0 + other_h = 1 # comment + other_c = 1 ; comment + colon = ; + hash = # """ @@ -76,6 +80,20 @@ class TestLoad(object): result = configuration.load(conf_path) assert result.get('global', 'default') == '0' + def test_load_with_colon_comments(self, tmpdir): + conf_path = os.path.join(str(tmpdir), 'ceph.conf') + with open(conf_path, 'w') as conf: + conf.write(tabbed_conf) + result = configuration.load(conf_path) + assert result.get('global', 'other_c') == '1' + + def test_load_with_hash_comments(self, tmpdir): + conf_path = os.path.join(str(tmpdir), 'ceph.conf') + with open(conf_path, 'w') as conf: + conf.write(tabbed_conf) + result = configuration.load(conf_path) + assert result.get('global', 'other_h') == '1' + def test_path_does_not_exist(self): with pytest.raises(exceptions.ConfigurationError): conf = configuration.load('/path/does/not/exist/ceph.con') @@ -89,3 +107,11 @@ class TestLoad(object): configuration.load(ceph_conf) stdout, stderr = capsys.readouterr() assert 'File contains no section headers' in stdout + + @pytest.mark.parametrize('commented', ['colon','hash']) + def test_coment_as_a_value(self, tmpdir, commented): + conf_path = os.path.join(str(tmpdir), 'ceph.conf') + with open(conf_path, 'w') as conf: + conf.write(tabbed_conf) + result = configuration.load(conf_path) + assert result.get('global', commented) == '' -- 2.47.3