[bug] set errbacks before gathering results

src/leap/soledad/common/couch/state.py

@@ -93,9 +93,8 @@ def _check_db_schema_version(url, db, auth, agent=None):
 
 
 def _stop(failure, reactor):
-    exception = failure.value.subFailure.value
     logger.error("Failure while checking schema versions: %r - %s"
-                 % (exception, exception.message))
+                 % (failure, failure.message))
     reactor.addSystemEventTrigger('after', 'shutdown', os._exit, 1)
     reactor.stop()
 
@@ -124,9 +123,9 @@ def check_schema_versions(couch_url, agent=None, reactor=reactor):
         if not db.startswith('user-'):
             continue
         d = semaphore.run(_check_db_schema_version, url, db, auth, agent=agent)
+        d.addErrback(_stop, reactor=reactor)
         deferreds.append(d)
     d = defer.gatherResults(deferreds, consumeErrors=True)
-    d.addErrback(_stop, reactor=reactor)
     yield d
 
 

tests/couch/test_state.py

@@ -47,7 +47,7 @@ class CouchDesignDocsTests(CouchDBTestCase):
         mocked_reactor = mock.Mock()
         yield check_schema_versions(
             self.couch_url, agent=self.agent, reactor=mocked_reactor)
-        self.assertTrue(mocked_reactor.stop.call_count == 1)
+        mocked_reactor.stop.assert_called()
 
     @defer.inlineCallbacks
     def test__check_db_schema_version_missing_config_doc_raises(self):
@@ -62,4 +62,4 @@ class CouchDesignDocsTests(CouchDBTestCase):
         mocked_reactor = mock.Mock()
         yield check_schema_versions(
             self.couch_url, agent=self.agent, reactor=mocked_reactor)
-        self.assertTrue(mocked_reactor.stop.call_count == 1)
+        mocked_reactor.stop.assert_called()