[tor-commits] [stem/master] Disabling flaky bits of descriptor tests

[atagar at torproject.org]

commit e73c4f353612ad26b47ca2c66d8c6f4ac78f165b
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Nov 17 10:57:30 2012 -0800

    Disabling flaky bits of descriptor tests
    
    As per 'https://trac.torproject.org/7163' the network status and server
    descriptor integ tests are flaky right now. We read our cached consensus and
    network status document for a relay, then query the control socket for that
    relay. This really seems like it should work, but sometimes tor replies with an
    unknown key error (ie, saying the relay doesn't exist).
    
    There's no point in keeping this test while it's flaky. We should investigate
    what's going wrong at some point so keeping the ticket open for that.
---
 test/integ/control/controller.py |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py
index c1bdda8..571d3ab 100644
--- a/test/integ/control/controller.py
+++ b/test/integ/control/controller.py
@@ -451,6 +451,9 @@ class TestController(unittest.TestCase):
       self.assertRaises(stem.ControllerError, controller.get_server_descriptor, "blargg")
       self.assertRaises(stem.ControllerError, controller.get_server_descriptor, "5" * 40)
       
+      test.runner.skip(self, "(https://trac.torproject.org/7163)")
+      return
+      
       first_descriptor = None
       with stem.descriptor.reader.DescriptorReader([descriptor_path]) as reader:
         for desc in reader:
@@ -511,6 +514,9 @@ class TestController(unittest.TestCase):
       # our cached consensus is v3 but the control port can only be queried for
       # v2 or v1 network status information
       
+      test.runner.skip(self, "(https://trac.torproject.org/7163)")
+      return
+      
       first_descriptor = None
       with stem.descriptor.reader.DescriptorReader([descriptor_path]) as reader:
         for desc in reader: