]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume test leading whitespace is handled in configurations 19259/head
authorAlfredo Deza <adeza@redhat.com>
Thu, 30 Nov 2017 13:58:37 +0000 (08:58 -0500)
committerAlfredo Deza <adeza@redhat.com>
Thu, 30 Nov 2017 13:58:37 +0000 (08:58 -0500)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
src/ceph-volume/ceph_volume/tests/test_configuration.py

index 5ef7fae47f8bcc2cca3afa851b4372d0528cdcf0..51ead952291fcd2d48c0f974a42aa4a5e7d92337 100644 (file)
@@ -7,6 +7,11 @@ from textwrap import dedent
 import pytest
 from ceph_volume import configuration, exceptions
 
+tabbed_conf = """
+[global]
+            default = 0
+"""
+
 
 class TestConf(object):
 
@@ -64,6 +69,13 @@ class TestConf(object):
 
 class TestLoad(object):
 
+    def test_load_from_path(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', 'default') == '0'
+
     def test_path_does_not_exist(self):
         with pytest.raises(exceptions.ConfigurationError):
             conf = configuration.load('/path/does/not/exist/ceph.con')
@@ -73,7 +85,7 @@ class TestLoad(object):
         ceph_conf = os.path.join(str(tmpdir), 'ceph.conf')
         with open(ceph_conf, 'w') as config:
             config.write(']broken] config\n[[')
-        configuration.load(ceph_conf)
+        with pytest.raises(RuntimeError):
+            configuration.load(ceph_conf)
         stdout, stderr = capsys.readouterr()
-        assert 'Unable to read configuration file' in stdout
         assert 'File contains no section headers' in stdout