More robust test_read_preference.

Author: ajdavis

test/high_availability/ha_tools.py

@@ -315,6 +315,15 @@ def get_primary():
  return None
 
 
+def wait_for_primary():
+ for _ in range(30):
+ time.sleep(1)
+ if get_primary():
+ break
+ else:
+ raise AssertionError("Primary didn't come back up")
+
+
 def get_random_secondary():
  secondaries = get_members_in_state(2)
  if len(secondaries):

test/high_availability/test_ha.py

@@ -703,15 +703,11 @@ def unpartition_node(node):
 
  # 3. PRIMARY UP, ONE SECONDARY DOWN -----------------------------------
  ha_tools.restart_members([killed])
-
- for _ in range(30):
- if ha_tools.get_primary():
- break
- sleep(1)
- else:
- self.fail("Primary didn't come back up")
+ ha_tools.wait_for_primary()
 
  ha_tools.kill_members([unpartition_node(secondary)], 2)
+ sleep(5)
+ ha_tools.wait_for_primary()
  self.assertTrue(MongoClient(
  unpartition_node(primary), use_greenlets=use_greenlets,
  read_preference=PRIMARY_PREFERRED