[tor-commits] [stem/master] Not properly aborting test when skip() is unavailable

[atagar@xxxxxxxxxxxxxx]

commit 89ec87cfa3c119d96ee32d7debec0dde9e97cb51
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Mon Oct 29 19:07:03 2012 -0700

    Not properly aborting test when skip() is unavailable
    
    The test_cached_microdesc_consensus test is missing a return after its skip,
    causing us to fail if...
    
    1. We don't have a microdescriptor consensus.
    2. We're running python 2.5 or 2.6
    
    Spotted by gsathya on...
    https://trac.torproject.org/7250
---
 test/integ/descriptor/networkstatus.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py
index 96ce12f..1b70898 100644
--- a/test/integ/descriptor/networkstatus.py
+++ b/test/integ/descriptor/networkstatus.py
@@ -68,6 +68,7 @@ class TestNetworkStatus(unittest.TestCase):
     
     if not os.path.exists(consensus_path):
       test.runner.skip(self, "(no cached-microdesc-consensus)")
+      return
     elif stem.util.system.is_windows():
       test.runner.skip(self, "(unavailable on windows)")
       return

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