diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-04 01:30:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-04 01:30:56 +0000 |
| commit | 89fee425451c31e352ba7f53bdd9486588f82e27 (patch) | |
| tree | abcde9afc0a84c1870cf29b31ee53b74c9c87979 | |
| parent | 2bf047813b807d20e17ec946e22908175e699f1d (diff) | |
| parent | 2ce6341b527e81a43513adef6f5c54b4e09e27a4 (diff) | |
| download | swift-89fee425451c31e352ba7f53bdd9486588f82e27.tar.gz | |
Merge "Fix up the return value of launch()"
| -rw-r--r-- | swift/common/manager.py | 4 | ||||
| -rw-r--r-- | test/unit/common/test_manager.py | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/swift/common/manager.py b/swift/common/manager.py index 583912b3c..a4ef350da 100644 --- a/swift/common/manager.py +++ b/swift/common/manager.py @@ -624,7 +624,7 @@ class Server(object): """ conf_files = self.conf_files(**kwargs) if not conf_files: - return [] + return {} pids = self.get_running_pids(**kwargs) @@ -644,7 +644,7 @@ class Server(object): if already_started: print _("%s already started...") % self.server - return [] + return {} if self.server not in START_ONCE_SERVERS: kwargs['once'] = False diff --git a/test/unit/common/test_manager.py b/test/unit/common/test_manager.py index 37f8dbc6d..be330b58d 100644 --- a/test/unit/common/test_manager.py +++ b/test/unit/common/test_manager.py @@ -1476,6 +1476,7 @@ class TestManager(unittest.TestCase): def launch(self, **kwargs): self.called['launch'].append(kwargs) + return {} def wait(self, **kwargs): self.called['wait'].append(kwargs) @@ -1538,6 +1539,7 @@ class TestManager(unittest.TestCase): def launch(self, **kwargs): self.called['launch'].append(kwargs) + return {} def wait(self, **kwargs): self.called['wait'].append(kwargs) @@ -1589,6 +1591,7 @@ class TestManager(unittest.TestCase): def launch(self, **kwargs): self.called['launch'].append(kwargs) + return {} def interact(self, **kwargs): self.called['interact'].append(kwargs) @@ -1630,7 +1633,8 @@ class TestManager(unittest.TestCase): return 0 def launch(self, **kwargs): - return self.called['launch'].append(kwargs) + self.called['launch'].append(kwargs) + return {} orig_swift_server = manager.Server try: |