[tor-commits] [stem/master] Integ tests didn't account for defaulting to get our own descriptor

[atagar at torproject.org]

commit 48fa71775f2bd0f36d90365aea085d18893b16b9
Author: Damian Johnson <atagar at torproject.org>
Date:   Fri Sep 5 08:38:07 2014 -0700

    Integ tests didn't account for defaulting to get our own descriptor
    
    Oops, not sure how that slipped in. We changed our Controller's descriptor
    fetching methods to get our own descriptor if we don't specify a relay, but we
    had a test checking that we raised a ValueError.
---
 test/integ/control/controller.py |    2 --
 1 file changed, 2 deletions(-)

diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py
index c2c1d91..05ce3f7 100644
--- a/test/integ/control/controller.py
+++ b/test/integ/control/controller.py
@@ -918,7 +918,6 @@ class TestController(unittest.TestCase):
 
     with test.runner.get_runner().get_tor_controller() as controller:
       # we should balk at invalid content
-      self.assertRaises(ValueError, controller.get_microdescriptor, None)
       self.assertRaises(ValueError, controller.get_microdescriptor, '')
       self.assertRaises(ValueError, controller.get_microdescriptor, 5)
       self.assertRaises(ValueError, controller.get_microdescriptor, 'z' * 30)
@@ -1026,7 +1025,6 @@ class TestController(unittest.TestCase):
 
     with test.runner.get_runner().get_tor_controller() as controller:
       # we should balk at invalid content
-      self.assertRaises(ValueError, controller.get_network_status, None)
       self.assertRaises(ValueError, controller.get_network_status, '')
       self.assertRaises(ValueError, controller.get_network_status, 5)
       self.assertRaises(ValueError, controller.get_network_status, 'z' * 30)