openstack/deb-python-oslo.service
Code Issues Proposed changes

Merge "Fix some reST field lists in docstrings"

Browse Source
This commit is contained in:
Jenkins
2017-03-29 10:34:34 +00:00
committed by Gerrit Code Review
parent 055119f71f add1b72780
commit b20bd84cbe
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
oslo_service/service.py
View File

@@ -240,7 +240,6 @@ class Launcher(object):
:returns: The return value from reload_config_files or :returns: The return value from reload_config_files or
mutate_config_files, according to the restart_method. mutate_config_files, according to the restart_method.
""" """
if self.restart_method == 'reload': if self.restart_method == 'reload':
self.conf.reload_config_files() self.conf.reload_config_files()

6
oslo_service/tests/base.py
View File

@@ -39,7 +39,7 @@ class ServiceBaseTestCase(test_base.BaseTestCase):
def get_new_temp_dir(self): def get_new_temp_dir(self):
"""Create a new temporary directory. """Create a new temporary directory.
:returns fixtures.TempDir :returns: fixtures.TempDir
""" """
return self.useFixture(fixtures.TempDir()) return self.useFixture(fixtures.TempDir())
@@ -48,7 +48,7 @@ class ServiceBaseTestCase(test_base.BaseTestCase):
Returns the same directory during the whole test case. Returns the same directory during the whole test case.
:returns fixtures.TempDir :returns: fixtures.TempDir
""" """
if not hasattr(self, '_temp_dir'): if not hasattr(self, '_temp_dir'):
self._temp_dir = self.get_new_temp_dir() self._temp_dir = self.get_new_temp_dir()
@@ -67,7 +67,7 @@ class ServiceBaseTestCase(test_base.BaseTestCase):
:type filename: string :type filename: string
:param root: temporary directory to create a new file in :param root: temporary directory to create a new file in
:type root: fixtures.TempDir :type root: fixtures.TempDir
:returns absolute file path string :returns: absolute file path string
""" """
root = root or self.get_default_temp_dir() root = root or self.get_default_temp_dir()
return root.join(filename) return root.join(filename)