[tor-commits] [stem/master] Test failure due to get_socks_listeners removal

[atagar at torproject.org]

commit c5a4538bb5a833ad66018d7b644492b2f269ebdf
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Mar 12 17:17:03 2020 -0700

    Test failure due to get_socks_listeners removal
    
    Our deprecated get_socks_listeners() method was removed. Fixing a few tests
    that broke when we run our ONLINE target...
    
      ======================================================================
      ERROR: test_get_streams
      ----------------------------------------------------------------------
      Traceback (most recent call last):
        File "/home/atagar/Desktop/stem/test/require.py", line 73, in wrapped
          return func(self, *args, **kwargs)
        File "/home/atagar/Desktop/stem/test/require.py", line 73, in wrapped
          return func(self, *args, **kwargs)
        File "/home/atagar/Desktop/stem/test/integ/control/controller.py", line 1069, in test_get_streams
          socks_listener = controller.get_socks_listeners()[0]
      AttributeError: 'Controller' object has no attribute 'get_socks_listeners'
---
 test/integ/control/controller.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py
index b6bf9c9a..5e92bfd7 100644
--- a/test/integ/control/controller.py
+++ b/test/integ/control/controller.py
@@ -951,8 +951,6 @@ class TestController(unittest.TestCase):
 
     with runner.get_tor_controller() as controller:
       self.assertTrue(controller.is_feature_enabled('VERBOSE_NAMES'))
-
-      self.assertTrue('VERBOSE_NAMES' in controller._enabled_features)
       self.assertRaises(stem.InvalidArguments, controller.enable_feature, ['NOT', 'A', 'FEATURE'])
 
       try:
@@ -1066,7 +1064,7 @@ class TestController(unittest.TestCase):
     runner = test.runner.get_runner()
     with runner.get_tor_controller() as controller:
       # we only need one proxy port, so take the first
-      socks_listener = controller.get_socks_listeners()[0]
+      socks_listener = controller.get_listeners(Listener.SOCKS)[0]
 
       with test.network.Socks(socks_listener) as s:
         s.settimeout(30)
@@ -1090,7 +1088,7 @@ class TestController(unittest.TestCase):
     with runner.get_tor_controller() as controller:
       # use the first socks listener
 
-      socks_listener = controller.get_socks_listeners()[0]
+      socks_listener = controller.get_listeners(Listener.SOCKS)[0]
 
       with test.network.Socks(socks_listener) as s:
         s.settimeout(30)
@@ -1423,7 +1421,7 @@ class TestController(unittest.TestCase):
 
         try:
           circuit_id = controller.new_circuit(await_build = True)
-          socks_listener = controller.get_socks_listeners()[0]
+          socks_listener = controller.get_listeners(Listener.SOCKS)[0]
 
           with test.network.Socks(socks_listener) as s:
             s.settimeout(30)