[tor-commits] [ooni-probe/master] * Removed unused optFlags attribute from nettest.TestCase.

[isis@xxxxxxxxxxxxxx]

commit d5e2a88eaf35283568ac8bd3906c8c3ef6e1e555
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Thu Nov 1 08:52:40 2012 +0000

    * Removed unused optFlags attribute from nettest.TestCase.
    * Added log.debug statement to figure out where the error is coming from.
---
 ooni/nettest.py |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ooni/nettest.py b/ooni/nettest.py
index bb9a404..ff16f0a 100644
--- a/ooni/nettest.py
+++ b/ooni/nettest.py
@@ -160,19 +160,17 @@ class TestCase(unittest.TestCase):
                 continue
             elif attr.name is 'optParameters':
                 cls._optParameters = attr.object
-            elif attr.name is 'optFlags':
-                log.debug("Applying %s.%s = %s to data descriptor..."
-                          % (cls.__name__, "_"+attr.name, attr.object))
-                cls._optParameters = attr.object
             else:
                 log.debug("How did we get here? attr.name = %s" % attr.name)
         '''
+        log.debug("Getting options for test")
+
         if self.localOptions:
             if self.inputs[0] is not None or self.inputFile is not None:
                 self.__get_inputs__()
             return self.localOptions
         else:
-            raise Exception, "could not find cls.localOptions! 234"
+            log.debug("could not find cls.localOptions!")
 
         # if options:
         #     return options



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