diff --git a/src/caosdb/common/administration.py b/src/caosdb/common/administration.py index e5a817b7f830a80cc48441a15a5b05a047af7503..2852c5c040404337f6f670670f96105280887177 100644 --- a/src/caosdb/common/administration.py +++ b/src/caosdb/common/administration.py @@ -32,7 +32,7 @@ from caosdb.common.utils import xml2str def set_server_property(key, value): - """set_server_property + """set_server_property. Set a server property. @@ -55,7 +55,7 @@ def set_server_property(key, value): def get_server_properties(): - """get_server_properties + """get_server_properties. Get all server properties as a dict. @@ -74,7 +74,7 @@ def get_server_properties(): def get_server_property(key): - """get_server_property + """get_server_property. Get a server property. diff --git a/src/caosdb/connection/connection.py b/src/caosdb/connection/connection.py index 90e6f40199228cc037640af76f58ca4506ebb88b..2fa67c712ab7fa0940727e220e940542d3e8f4d5 100644 --- a/src/caosdb/connection/connection.py +++ b/src/caosdb/connection/connection.py @@ -72,7 +72,7 @@ class _WrappedHTTPResponse(CaosDBHTTPResponse): class _DefaultCaosDBServerConnection(CaosDBServerConnection): - """_DefaultCaosDBServerConnection + """_DefaultCaosDBServerConnection. Methods ------- @@ -87,7 +87,7 @@ class _DefaultCaosDBServerConnection(CaosDBServerConnection): self._base_path = None def request(self, method, path, headers=None, body=None, **kwargs): - """request + """request. Send a HTTP request to the server. @@ -121,7 +121,7 @@ class _DefaultCaosDBServerConnection(CaosDBServerConnection): return _WrappedHTTPResponse(self._http_con.getresponse()) def configure(self, **config): - """configure + """configure. Configure the http connection. @@ -196,7 +196,7 @@ _DEFAULT_CONF = {"password_method": "plain", "implementation": def _get_authenticator(**config): - """_get_authenticator + """_get_authenticator. Import and configure the password_method. diff --git a/unittests/test_administraction.py b/unittests/test_administraction.py index 56bedee2d25bb0f1523fd05bd6ce0cb8724ba921..dc05be2ac7c19ae066b9c8829677626796cea5fa 100644 --- a/unittests/test_administraction.py +++ b/unittests/test_administraction.py @@ -49,6 +49,7 @@ def test_get_server_property_success(): lambda **kwargs: MockUpResponse(200, {}, properties)) assert "TEST_VAL" == administration.get_server_property("TEST_PROP") + def test_get_server_property_key_error(): properties = "<Properties><TEST_PROP>TEST_VAL</TEST_PROP></Properties>" get_connection()._delegate_connection.resources.append( @@ -56,6 +57,7 @@ def test_get_server_property_key_error(): with raises(KeyError) as e: assert administration.get_server_property("BLA") + def test_set_server_property(): def check_form(**kwargs): assert kwargs["path"] == "_server_properties"