Attempt to fix travis build setup via bash+chutney

setup.py

@@ -28,8 +28,6 @@
         'Topic :: System :: Networking',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
     ],
     license="GPLv3",
     packages=["txmix"],

test/scripts/install-chutney.sh

@@ -10,19 +10,10 @@ cd chutney
 ./chutney status networks/basic-025
 
 # Retry verify until Tor circuit creation is working
+echo before find
 client_torrc=$(find net/nodes -wholename "*c/torrc" | head -n1)
+echo before grep $client_torrc
 control_port=$(grep -Po -m1 "ControlPort\s(\d+)$" $client_torrc | awk '{print $2}')
 export CHUTNEY_CONTROL_PORT="$control_port"
-n=0
-until [ $n -ge 10 ]
-do
-  output=$(./chutney verify networks/basic-025)
-  # Check if chutney output included 'Transmission: Success'.
-  if [[ $output == *"Transmission: Success"* ]]; then
-    break
-  else
-    n=$[$n+1]
-    sleep 5
-  fi
-done
-cd ..
+
+echo chutney control port is $CHUTNEY_CONTROL_PORT

txmix/onion_transport.py

@@ -142,7 +142,7 @@ def addr(self):
 
     def register_protocol(self, protocol):
         # XXX todo: assert that protocol provides the appropriate interface
-        self.mix_protocol = protocol
+        self.protocol = protocol
 
     def start(self):
         """
@@ -201,14 +201,14 @@ def do_send(self, addr, message):
         onion_host, onion_port = addr
         tor_endpoint = self.tor.stream_via(onion_host, onion_port)
         send_message_protocol = Int32StringReceiver()
-        self.remote_mix_protocol = yield endpoints.connectProtocol(tor_endpoint, send_message_protocol)
-        self.remote_mix_protocol.sendString(message)
-        self.remote_mix_protocol.transport.loseConnection()
+        self.remote_protocol = yield endpoints.connectProtocol(tor_endpoint, send_message_protocol)
+        self.remote_protocol.sendString(message)
+        self.remote_protocol.transport.loseConnection()
 
     # Protocol parent method overwriting
 
     def datagram_received(self, data):
-        self.mix_protocol.received(data)
+        self.protocol.received(data)
 
     def connectionLost(self, reason):
         """