openstack/swift
Code Issues Proposed changes

Merge "Fix up the return value of launch()"

Browse Source
This commit is contained in:
Jenkins 2014-10-04 01:30:56 +00:00 committed by Gerrit Code Review
commit 89fee42545
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/manager.py
View File

@ -624,7 +624,7 @@ class Server(object):
""" """
conf_files = self.conf_files(**kwargs) conf_files = self.conf_files(**kwargs)
if not conf_files: if not conf_files:
return [] return {}
pids = self.get_running_pids(**kwargs) pids = self.get_running_pids(**kwargs)
@ -644,7 +644,7 @@ class Server(object):
if already_started: if already_started:
print _("%s already started...") % self.server print _("%s already started...") % self.server
return [] return {}
if self.server not in START_ONCE_SERVERS: if self.server not in START_ONCE_SERVERS:
kwargs['once'] = False kwargs['once'] = False

6
test/unit/common/test_manager.py
View File

@ -1476,6 +1476,7 @@ class TestManager(unittest.TestCase):
def launch(self, **kwargs): def launch(self, **kwargs):
self.called['launch'].append(kwargs) self.called['launch'].append(kwargs)
return {}
def wait(self, **kwargs): def wait(self, **kwargs):
self.called['wait'].append(kwargs) self.called['wait'].append(kwargs)
@ -1538,6 +1539,7 @@ class TestManager(unittest.TestCase):
def launch(self, **kwargs): def launch(self, **kwargs):
self.called['launch'].append(kwargs) self.called['launch'].append(kwargs)
return {}
def wait(self, **kwargs): def wait(self, **kwargs):
self.called['wait'].append(kwargs) self.called['wait'].append(kwargs)
@ -1589,6 +1591,7 @@ class TestManager(unittest.TestCase):
def launch(self, **kwargs): def launch(self, **kwargs):
self.called['launch'].append(kwargs) self.called['launch'].append(kwargs)
return {}
def interact(self, **kwargs): def interact(self, **kwargs):
self.called['interact'].append(kwargs) self.called['interact'].append(kwargs)
@ -1630,7 +1633,8 @@ class TestManager(unittest.TestCase):
return 0 return 0
def launch(self, **kwargs): def launch(self, **kwargs):
return self.called['launch'].append(kwargs) self.called['launch'].append(kwargs)
return {}
orig_swift_server = manager.Server orig_swift_server = manager.Server
try: try: