openstack/trove
Code Issues Proposed changes

Merge "Fix tox py27 error"

Browse Source
This commit is contained in:
Jenkins 2015-11-14 07:13:33 +00:00 committed by Gerrit Code Review
commit 87c06eb437
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
trove/guestagent/common/operating_system.py
View File

@ -248,6 +248,7 @@ def file_discovery(file_candidates):
for file in file_candidates: for file in file_candidates:
if os.path.isfile(file): if os.path.isfile(file):
return file return file
return ''
def start_service(service_candidates): def start_service(service_candidates):

4
trove/tests/unittests/guestagent/test_operating_system.py
View File

@ -819,6 +819,10 @@ class TestOperatingSystem(trove_testtools.TestCase):
config_file = operating_system.file_discovery( config_file = operating_system.file_discovery(
["/etc/mongodb.conf", "/etc/mongod.conf"]) ["/etc/mongodb.conf", "/etc/mongod.conf"])
self.assertEqual('/etc/mongod.conf', config_file) self.assertEqual('/etc/mongod.conf', config_file)
with patch.object(os.path, 'isfile', side_effect=[False]):
config_file = operating_system.file_discovery(
["/etc/mongodb.conf"])
self.assertEqual('', config_file)
def test_list_files_in_directory(self): def test_list_files_in_directory(self):
root_path = tempfile.mkdtemp() root_path = tempfile.mkdtemp()