[tor-commits] [ooni-probe/master] Run one test at a time

[art at torproject.org]

commit 2e88a046d9750b7187a04b9acf6981fb380b6802
Author: Arturo Filastò <arturo at filasto.net>
Date:   Wed Feb 3 22:54:45 2016 +0100

    Run one test at a time
---
 ooni/oonicli.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ooni/oonicli.py b/ooni/oonicli.py
index b9133c9..9509a18 100644
--- a/ooni/oonicli.py
+++ b/ooni/oonicli.py
@@ -300,6 +300,7 @@ def runTestWithDirector(director, global_options, url=None,
 
     # Wait until director has started up (including bootstrapping Tor)
     # before adding tests
+    @defer.inlineCallbacks
     def post_director_start(_):
         for net_test_loader in deck.netTestLoaders:
             # Decks can specify different collectors
@@ -319,11 +320,10 @@ def runTestWithDirector(director, global_options, url=None,
 
             net_test_loader.annotations = global_options['annotations']
 
-            director.startNetTest(net_test_loader,
-                                  global_options['reportfile'],
-                                  collector,
-                                  global_options['no-yamloo'])
-        return director.allTestsDone
+            yield director.startNetTest(net_test_loader,
+                                        global_options['reportfile'],
+                                        collector,
+                                        global_options['no-yamloo'])
 
     d.addCallback(setup_nettest)
     d.addCallback(post_director_start)