remove yield defer.returnValue

Signed-off-by: Pierre Tardy <tardyp@gmail.com>
buildbot · Jul 14, 2015 · e92551e · e92551e
1 parent c31a80b
commit e92551e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 10 deletions.
diff --git a/master/buildbot/statistics/capture.py b/master/buildbot/statistics/capture.py
@@ -112,9 +112,6 @@ def consumer(self, routingKey, msg):
                 yield threads.deferToThread(svc.postStatsValue, post_data, series_name,
                                             context)
 
-        else:
-            yield defer.returnValue(None)
-
 
 class CaptureBuildStartTime(CaptureBuildTimes):
 
@@ -209,6 +206,3 @@ def consumer(self, routingKey, msg):
             for svc in self.parent_svcs:
                 yield threads.deferToThread(svc.postStatsValue, post_data, series_name,
                                             context)
-
-        else:
-            yield defer.returnValue(None)
diff --git a/master/buildbot/statistics/stats_service.py b/master/buildbot/statistics/stats_service.py
@@ -89,4 +89,3 @@ def yieldMetricsValue(self, data_name, post_data, buildid):
         msg['build_data'] = build_data
 
         self.master.mq.produce(routingKey, msg)
-        yield defer.returnValue(None)
diff --git a/master/buildbot/test/unit/test_stats_service.py b/master/buildbot/test/unit/test_stats_service.py
@@ -200,7 +200,6 @@ def end_build_call_consumers(self):
                                         state_string=u'',
                                         results=0,
                                         ))
-        yield defer.returnValue(None)
 
     @staticmethod
     def identity(f, *args, **kwargs):
@@ -336,7 +335,6 @@ def test_capture_data(self):
             'builder1-test',
             {'build_number': '1', 'builder_name': 'builder1'}
         )], self.fake_storage_service.stored_data)
-        yield defer.returnValue(None)
 
     @defer.inlineCallbacks
     def test_capture_data_alt_callback(self):
@@ -359,4 +357,3 @@ def cb(*args, **kwargs):
             'builder1-test',
             {'build_number': '1', 'builder_name': 'builder1'}
         )], self.fake_storage_service.stored_data)
-        yield defer.returnValue(None)