More waits and Python3 work

system_test/full_system_test.py

@@ -18,9 +18,14 @@ import time
 import socket
 import sqlite3
 import sys
-from urlparse import urlparse
 import unittest
 
+# Help with Python3
+try:
+  from urlparse import urlparse
+except ImportError:
+  from urllib.parse import urlparse
+
 RQLITED_PATH = os.environ['RQLITED_PATH']
 TIMEOUT=10
 
@@ -32,9 +37,13 @@ class Node(object):
                raft_snap_threshold=8192, raft_snap_int="1s",
                dir=None, on_disk=False):
     if api_addr is None:
-      api_addr = random_addr()
+      s, addr = random_addr()
+      api_addr = addr
+      s.close()
     if raft_addr is None:
-      raft_addr = random_addr()
+      s, addr = random_addr()
+      raft_addr = addr
+      s.close()
     if dir is None:
       dir = tempfile.mkdtemp()
     if api_adv is None:
@@ -69,13 +78,21 @@ class Node(object):
   def scramble_network(self):
     if self.api_adv == self.api_addr:
       self.api_adv = None
-    self.api_addr = random_addr()
+
+    s, addr = random_addr()
+    self.api_addr = addr
+    s.close()
+
     if self.api_adv is None:
       self.api_adv = self.api_addr
 
     if self.raft_adv == self.raft_addr:
       self.raft_adv = None
-    self.raft_addr = random_addr()
+
+    s, addr = random_addr()
+    self.raft_addr = addr
+    s.close()
+
     if self.raft_adv is None:
       self.raft_adv = self.raft_addr
 
@@ -205,7 +222,7 @@ class Node(object):
     t = 0
     while self.fsm_index() < index:
       if t > timeout:
-        raise Exception('timeout, target index: %d, actual index: %d' % (index, self.fsm_index()))
+        raise Exception('timeout, target index: %d, actual index %d' % (index, self.fsm_index()))
       time.sleep(1)
       t+=1
     return self.fsm_index()
@@ -338,7 +355,7 @@ def raise_for_status(r):
 def random_addr():
   s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
   s.bind(('localhost', 0))
-  return ':'.join([s.getsockname()[0], str(s.getsockname()[1])])
+  return s, ':'.join([s.getsockname()[0], str(s.getsockname()[1])])
 
 def deprovision_node(node):
   node.stop()
@@ -933,9 +950,13 @@ class TestEndToEndSnapRestoreCluster(unittest.TestCase):
     self.n2.start(join=self.n0.APIAddr())
     self.n2.wait_for_leader()
 
+
     # Ensure those new nodes have the full correct state.
+    self.n1.wait_for_fsm_index(self.n0.fsm_index())
     j = self.n1.query('SELECT count(*) FROM foo', level='none')
     self.assertEqual(str(j), "{u'results': [{u'values': [[200]], u'types': [u''], u'columns': [u'count(*)']}]}")
+
+    self.n2.wait_for_fsm_index(self.n0.fsm_index())
     j = self.n2.query('SELECT count(*) FROM foo', level='none')
     self.assertEqual(str(j), "{u'results': [{u'values': [[200]], u'types': [u''], u'columns': [u'count(*)']}]}")