Merge pull request basho#170 from evanmcc/pevm-unittest-determinism

Unit test enhancements

Author: evanmcc

riak/client/operations.py

@@ -89,7 +89,7 @@ def set_bucket_props(self, transport, bucket, props):
         """
         return transport.set_bucket_props(bucket, props)
 
-    @retryableHttpOnly
+    @retryable
     def clear_bucket_props(self, transport, bucket):
         """
         Resets bucket properties for the given bucket.

riak/tests/test_2i.py

@@ -28,7 +28,7 @@ def test_secondary_index_store(self):
             return True
 
         # Create a new object with indexes...
-        bucket = self.client.bucket('indexbucket')
+        bucket = self.client.bucket(self.bucket_name)
         rand = self.randint()
         obj = bucket.new('mykey1', rand)
         obj.add_index('field1_bin', 'val1a')
@@ -103,10 +103,10 @@ def test_set_indexes(self):
         if not self.is_2i_supported():
             return True
 
-        bucket = self.client.bucket('indexbucket')
+        bucket = self.client.bucket(self.bucket_name)
         foo = bucket.new('foo', 1)
         foo.set_indexes((('field1_bin', 'test'), ('field2_int', 1337))).store()
-        result = self.client.index('indexbucket', 'field2_int', 1337).run()
+        result = self.client.index(self.bucket_name, 'field2_int', 1337).run()
         self.assertEqual(1, len(result))
         self.assertEqual('foo', result[0].key)
 
@@ -119,7 +119,7 @@ def test_remove_indexes(self):
         if not self.is_2i_supported():
             return True
 
-        bucket = self.client.bucket('indexbucket')
+        bucket = self.client.bucket(self.bucket_name)
         bar = bucket.new('bar', 1).add_index('bar_int', 1)\
             .add_index('bar_int', 2).add_index('baz_bin', 'baz').store()
         result = bucket.get_index('bar_int', 1)
@@ -172,7 +172,7 @@ def test_secondary_index_query(self):
         if not self.is_2i_supported():
             return True
 
-        bucket = self.client.bucket('indexbucket')
+        bucket = self.client.bucket(self.bucket_name)
 
         bucket.\
             new('mykey1', 'data1').\
@@ -228,7 +228,7 @@ def test_secondary_index_invalid_name(self):
         if not self.is_2i_supported():
             return True
 
-        bucket = self.client.bucket('indexbucket')
+        bucket = self.client.bucket(self.bucket_name)
 
         with self.assertRaises(RiakError):
             bucket.new('k', 'a').add_index('field1', 'value1')

riak/tests/test_all.py

@@ -48,6 +48,34 @@
     test_server.prepare()
     test_server.start()
 
+testrun_search_bucket = None
+testrun_props_bucket = None
+testrun_sibs_bucket = None
+
+def setUpModule():
+    global testrun_search_bucket, testrun_props_bucket, \
+        testrun_sibs_bucket
+
+    c = RiakClient(transport='http', http_port=HTTP_PORT)
+
+    testrun_props_bucket = 'propsbucket'
+    testrun_sibs_bucket = 'sibsbucket'
+    c.bucket(testrun_sibs_bucket).allow_mult = True
+
+    if not int(os.environ.get('SKIP_SEARCH', '0')):
+        testrun_search_bucket = 'searchbucket' 
+        b = c.bucket(testrun_search_bucket)
+        b.enable_search()
+
+def tearDownModule():
+    c = RiakClient(transport='http', http_port=HTTP_PORT)
+    if not int(os.environ.get('SKIP_SEARCH', '0')):
+        b = c.bucket(testrun_search_bucket)
+        b.clear_properties()
+    b = c.bucket(testrun_sibs_bucket)
+    b.clear_properties()
+    b = c.bucket(testrun_props_bucket)
+    b.clear_properties()
 
 class BaseTestCase(object):
 
@@ -59,6 +87,13 @@ class BaseTestCase(object):
     def randint():
         return random.randint(1, 999999)
 
+    @staticmethod
+    def randname(length=12):
+        out = ''
+        for i in range(length):
+            out += chr(random.randint(ord('a'), ord('z')))
+        return out
+
     def create_client(self, host=None, http_port=None, pb_port=None,
                       protocol=None, **client_args):
         host = host or self.host or HOST
@@ -71,14 +106,13 @@ def create_client(self, host=None, http_port=None, pb_port=None,
                           pb_port=pb_port, **client_args)
 
     def setUp(self):
-        self.client = self.create_client()
+        self.bucket_name = self.randname()
+        self.key_name = self.randname()
+        self.search_bucket = testrun_search_bucket
+        self.sibs_bucket = testrun_sibs_bucket
+        self.props_bucket = testrun_props_bucket
 
-        # make sure these are not left over from a previous, failed run
-        bucket = self.client.bucket('bucket')
-        o = bucket.get('nonexistent_key_json')
-        o.delete()
-        o = bucket.get('nonexistent_key_binary')
-        o.delete()
+        self.client = self.create_client()
 
 
 class RiakPbcTransportTestCase(BasicKVTests,
@@ -100,6 +134,8 @@ def setUp(self):
         self.host = PB_HOST
         self.pb_port = PB_PORT
         self.protocol = 'pbc'
+        self.http_client = self.create_client(HTTP_HOST, 
+                                              http_port=HTTP_PORT)
         super(RiakPbcTransportTestCase, self).setUp()
 
     def test_uses_client_id_if_given(self):
@@ -109,12 +145,12 @@ def test_uses_client_id_if_given(self):
 
     def test_bucket_search_enabled(self):
         with self.assertRaises(NotImplementedError):
-            bucket = self.client.bucket("unsearch_bucket")
+            bucket = self.client.bucket(self.bucket_name)
             bucket.search_enabled()
 
     def test_enable_search_commit_hook(self):
         with self.assertRaises(NotImplementedError):
-            bucket = self.client.bucket("search_bucket")
+            bucket = self.client.bucket(self.bucket_name)
             bucket.enable_search()
 
 
@@ -140,12 +176,12 @@ def setUp(self):
         super(RiakHttpTransportTestCase, self).setUp()
 
     def test_no_returnbody(self):
-        bucket = self.client.bucket("bucket")
-        o = bucket.new("foo", "bar").store(return_body=False)
+        bucket = self.client.bucket(self.bucket_name)
+        o = bucket.new(self.key_name, "bar").store(return_body=False)
         self.assertEqual(o.vclock, None)
 
     def test_too_many_link_headers_shouldnt_break_http(self):
-        bucket = self.client.bucket("bucket")
+        bucket = self.client.bucket(self.bucket_name)
         o = bucket.new("lots_of_links", "My god, it's full of links!")
         for i in range(0, 400):
             link = RiakLink("other", "key%d" % i, "next")
@@ -156,7 +192,7 @@ def test_too_many_link_headers_shouldnt_break_http(self):
         self.assertEqual(len(stored_object.get_links()), 400)
 
     def test_clear_bucket_properties(self):
-        bucket = self.client.bucket('bucket')
+        bucket = self.client.bucket(self.props_bucket)
         bucket.allow_mult = True
         self.assertTrue(bucket.allow_mult)
         bucket.n_val = 1