[tor-commits] [stem/master] Bug with socket tests when we had an emulated chroot

[atagar@xxxxxxxxxxxxxx]

commit f921c569d3565a554f90a6ae72b52032eca86cb9
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Sun Apr 22 20:57:31 2012 -0700

    Bug with socket tests when we had an emulated chroot
    
    Forgot to make one of the fixes for handling chroot tests in a socket use case.
---
 test/integ/connection/connect.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/test/integ/connection/connect.py b/test/integ/connection/connect.py
index d61ddf7..29cf2dc 100644
--- a/test/integ/connection/connect.py
+++ b/test/integ/connection/connect.py
@@ -44,12 +44,15 @@ class TestConnect(unittest.TestCase):
     Basic sanity checks for the connect_socket_file function.
     """
     
+    runner = test.runner.get_runner()
+    
     control_socket = stem.connection.connect_socket_file(
       socket_path = test.runner.CONTROL_SOCKET_PATH,
       password = test.runner.CONTROL_PASSWORD,
+      chroot_path = runner.get_chroot(),
       controller = stem.connection.Controller.NONE)
     
-    if test.runner.Torrc.SOCKET in test.runner.get_runner().get_options():
+    if test.runner.Torrc.SOCKET in runner.get_options():
       test.runner.exercise_socket(self, control_socket)
       control_socket.close()
     else:



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