[tor-commits] [ooni-probe/master] Don't require the bouncer key to be present

[art@xxxxxxxxxxxxxx]

commit 156ce3f630eb58a061841dfa6d6f6f6cf6755d83
Author: Arturo Filastò <arturo@xxxxxxxxxxx>
Date:   Tue May 17 20:24:15 2016 +0200

    Don't require the bouncer key to be present
---
 ooni/deck.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ooni/deck.py b/ooni/deck.py
index 404a4d0..7a3b697 100644
--- a/ooni/deck.py
+++ b/ooni/deck.py
@@ -136,11 +136,11 @@ class Deck(InputFile):
             net_test_loader = NetTestLoader(test['options']['subargs'],
                                             annotations=test['options'].get('annotations', {}),
                                             test_file=nettest_path)
-            if test['options']['collector'] is not None:
+            if test['options'].get('collector', None) is not None:
                 net_test_loader.collector = CollectorClient(
                     test['options']['collector']
                 )
-            if test['options']['bouncer'] is not None:
+            if test['options'].get('bouncer', None) is not None:
                 self.bouncer = test['options']['bouncer']
             self.insert(net_test_loader)
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits