[tor-commits] [ooni-probe/master] Merge pull request #275 from TheTorProject/fix/test_timeout

[art@xxxxxxxxxxxxxx]

commit 7a132ea7c6b670ad8d577d894238287b6439b0e7
Merge: 6d5cf42 e258788
Author: aagbsn <aagbsn@xxxxxxxx>
Date:   Mon Feb 3 10:14:57 2014 -0800

    Merge pull request #275 from TheTorProject/fix/test_timeout
    
    Write test that reproduces HTTP test stalling condition.

 ooni/errors.py              |   11 ++++++-
 ooni/reporter.py            |    2 +-
 ooni/tasks.py               |   12 +++-----
 ooni/tests/test_managers.py |    2 +-
 ooni/tests/test_nettest.py  |   71 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 87 insertions(+), 11 deletions(-)



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