Merge pull request basho#339 from basho/bugfix/bch/yz-test-setup

Remove time.sleep() from YZ test cases

Author: Brett Hazen

riak/tests/test_mapreduce.py

@@ -2,6 +2,7 @@
 
 from riak.mapreduce import RiakMapReduce
 from riak import key_filter, RiakError
+from riak.tests.test_yokozuna import wait_for_yz_index
 import platform
 if platform.python_version() < '2.7':
     unittest = __import__('unittest2')
@@ -374,8 +375,7 @@ def test_mr_search(self):
                               "calories_i": 110,
                               "fruit_b": False}).store()
         # Wait for Solr to catch up
-        while len(bucket.search('_yz_rk:Crunch')['docs']) == 0:
-            pass
+        wait_for_yz_index(bucket, "Crunch")
         mr = RiakMapReduce(self.client).search(self.mr_bucket, 'fruit_b:false')
         mr.map("""function(v) {
             var solr_doc = JSON.parse(v.values[0].data);

riak/tests/test_yokozuna.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import platform
-import time
 if platform.python_version() < '2.7':
     unittest = __import__('unittest2')
 else:
@@ -9,12 +8,25 @@
 from . import RUN_YZ
 
 
+def wait_for_yz_index(bucket, key):
+    """
+    Wait until Solr index has been updated and a value returns from a query.
+
+    :param bucket: Bucket to which indexed value is written
+    :type bucket: RiakBucket
+    :param key: Key to which value was written
+    :type key: str
+    """
+    while len(bucket.search('_yz_rk:' + key)['docs']) == 0:
+        pass
+
+
 class YZSearchTests(object):
     @unittest.skipUnless(RUN_YZ, 'RUN_YZ is undefined')
     def test_yz_search_from_bucket(self):
         bucket = self.client.bucket(self.yz_bucket)
         bucket.new("user", {"user_s": "Z"}).store()
-        time.sleep(1)
+        wait_for_yz_index(bucket, "user")
         results = bucket.search("user_s:Z")
         self.assertEquals(1, len(results['docs']))
         # TODO: check that docs return useful info
@@ -49,7 +61,10 @@ def test_yz_delete_search_index(self):
         self.client.create_search_index(self.yz_bucket, '_yz_default', 3)
         b = self.client.bucket(self.yz_bucket)
         b.set_property('search_index', self.yz_bucket)
-        time.sleep(1)  # wait for index to apply
+        # Wait for index to apply
+        indexes = []
+        while self.yz_bucket not in indexes:
+            indexes = [i['name'] for i in self.client.list_search_indexes()]
 
     @unittest.skipUnless(RUN_YZ, 'RUN_YZ is undefined')
     def test_yz_list_search_indexes(self):
@@ -112,7 +127,7 @@ def test_yz_search_queries(self):
                          "age_i": 32}).store()
         bucket.new("H", {"username_s": "H", "name_s": "brett",
                          "age_i": 14}).store()
-        time.sleep(1)
+        wait_for_yz_index(bucket, "H")
         # multiterm
         results = bucket.search("username_s:(F OR H)")
         self.assertEquals(2, len(results['docs']))