clearing all properties now, some additional enhancements

Author: evanmcc

riak/client/operations.py

@@ -89,15 +89,15 @@ def set_bucket_props(self, transport, bucket, props):
         """
         return transport.set_bucket_props(bucket, props)
 
-    @retryableHttpOnly
-    def clear_bucket_props(self, transport, bucket):
+    def clear_bucket_props(self, bucket):
         """
         Resets bucket properties for the given bucket.
 
         :param bucket: the bucket whose properties will be set
         :type bucket: RiakBucket
         """
-        return transport.clear_bucket_props(bucket)
+        with self._transport() as transport:
+            return transport.clear_bucket_props(bucket)
 
     @retryable
     def get_keys(self, transport, bucket):

riak/tests/test_all.py

@@ -49,7 +49,33 @@
     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):
 
@@ -80,16 +106,11 @@ def create_client(self, host=None, http_port=None, pb_port=None,
                           pb_port=pb_port, **client_args)
 
     def setUp(self):
-        global testrun_search_bucket
         self.bucket_name = self.randname()
         self.key_name = self.randname()
-        if not testrun_search_bucket:
-            self.search_bucket = testrun_search_bucket = self.randname()
-            c = self.create_client(HTTP_HOST, http_port=HTTP_PORT)
-            b = c.bucket(self.search_bucket)
-            b.enable_search()
-        else:
-            self.search_bucket = testrun_search_bucket
+        self.search_bucket = testrun_search_bucket
+        self.sibs_bucket = testrun_sibs_bucket
+        self.props_bucket = testrun_props_bucket
 
         self.client = self.create_client()
 
@@ -171,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

riak/tests/test_kv.py

@@ -2,6 +2,7 @@
 import os
 import cPickle
 import copy
+
 try:
     import simplejson as json
 except ImportError:
@@ -168,18 +169,21 @@ def test_delete(self):
         self.assertFalse(obj.exists)
 
     def test_set_bucket_properties(self):
-        bucket = self.client.bucket(self.bucket_name)
+        bucket = self.client.bucket(self.props_bucket)
         # Test setting allow mult...
         bucket.allow_mult = True
-        self.assertTrue(bucket.allow_mult)
         # Test setting nval...
-        bucket.n_val = 3
-        self.assertEqual(bucket.n_val, 3)
+        bucket.n_val = 1
+        
+        bucket2 = self.create_client().bucket(self.props_bucket)
+        self.assertTrue(bucket2.allow_mult)
+        self.assertEqual(bucket2.n_val, 1)
         # Test setting multiple properties...
         bucket.set_properties({"allow_mult": False, "n_val": 2})
 
-        self.assertFalse(bucket.allow_mult)
-        self.assertEqual(bucket.n_val, 2)
+        bucket3 = self.create_client().bucket(self.props_bucket)
+        self.assertFalse(bucket3.allow_mult)
+        self.assertEqual(bucket3.n_val, 2)
 
     def test_if_none_match(self):
         bucket = self.client.bucket(self.bucket_name)
@@ -197,9 +201,9 @@ def test_if_none_match(self):
 
     def test_siblings(self):
         # Set up the bucket, clear any existing object...
-        bucket = self.client.bucket(self.bucket_name)
-        bucket.allow_mult = True
+        bucket = self.client.bucket(self.sibs_bucket)
         obj = bucket.get_binary(self.key_name)
+        bucket.allow_mult = True
 
         # Even if it previously existed, let's store a base resolved version
         # from which we can diverge by sending a stale vclock.
@@ -210,7 +214,7 @@ def test_siblings(self):
         vals = set()
         for i in range(5):
             other_client = self.create_client()
-            other_bucket = other_client.bucket(self.bucket_name)
+            other_bucket = other_client.bucket(self.sibs_bucket)
             while True:
                 randval = self.randint()
                 if randval not in vals:
@@ -223,7 +227,7 @@ def test_siblings(self):
 
         # Make sure the object has itself plus four siblings...
         obj.reload()
-        self.assertTrue(bool(obj.siblings))
+        #self.assertTrue(bool(obj.siblings))
         self.assertEqual(len(obj.siblings), 5)
 
         # Get each of the values - make sure they match what was assigned
@@ -279,7 +283,7 @@ def test_list_buckets(self):
 
 class HTTPBucketPropsTest(object):
     def test_rw_settings(self):
-        bucket = self.client.bucket(self.bucket_name)
+        bucket = self.client.bucket(self.props_bucket)
         self.assertEqual(bucket.r, "quorum")
         self.assertEqual(bucket.w, "quorum")
         self.assertEqual(bucket.dw, "quorum")
@@ -301,9 +305,10 @@ def test_rw_settings(self):
                                'r': 'quorum',
                                'dw': 'quorum',
                                'rw': 'quorum'})
+        bucket.clear_properties()
 
     def test_primary_quora(self):
-        bucket = self.client.bucket(self.bucket_name)
+        bucket = self.client.bucket(self.props_bucket)
         self.assertEqual(bucket.pr, 0)
         self.assertEqual(bucket.pw, 0)
 
@@ -314,11 +319,12 @@ def test_primary_quora(self):
         self.assertEqual(bucket.pw, "quorum")
 
         bucket.set_properties({'pr': 0, 'pw': 0})
+        bucket.clear_properties()
 
 
 class PbcBucketPropsTest(object):
     def test_rw_settings(self):
-        bucket = self.client.bucket('rwsettings')
+        bucket = self.client.bucket(self.props_bucket)
         with self.assertRaises(NotImplementedError):
             bucket.r
         with self.assertRaises(NotImplementedError):
@@ -336,9 +342,11 @@ def test_rw_settings(self):
             bucket.dw = 2
         with self.assertRaises(NotImplementedError):
             bucket.rw = 2
+        with self.assertRaises(NotImplementedError):
+            bucket.clear_properties()
 
     def test_primary_quora(self):
-        bucket = self.client.bucket('primary_quora')
+        bucket = self.client.bucket(self.props_bucket)
         with self.assertRaises(NotImplementedError):
             bucket.pr
         with self.assertRaises(NotImplementedError):

riak/tests/test_search.py

@@ -17,19 +17,23 @@ def test_bucket_search_enabled(self):
 
     @unittest.skipIf(SKIP_SEARCH, 'SKIP_SEARCH is defined')
     def test_enable_search_commit_hook(self):
-        bucket = self.client.bucket(self.bucket_name)
+        bucket = self.client.bucket(self.search_bucket)
+        bucket.clear_properties()
+        self.assertFalse(self.create_client().bucket(self.search_bucket).search_enabled())
         bucket.enable_search()
-        self.assertTrue(self.client.bucket(self.bucket_name).search_enabled())
+        self.assertTrue(self.create_client().bucket(self.search_bucket).search_enabled())
 
     @unittest.skipIf(SKIP_SEARCH, 'SKIP_SEARCH is defined')
     def test_disable_search_commit_hook(self):
-        bucket = self.client.bucket(self.bucket_name)
+        bucket = self.client.bucket(self.search_bucket)
+        bucket.clear_properties()
         bucket.enable_search()
-        self.assertTrue(self.client.bucket(self.bucket_name)\
+        self.assertTrue(self.create_client().bucket(self.search_bucket)\
                             .search_enabled())
         bucket.disable_search()
-        self.assertFalse(self.client.bucket(self.bucket_name)\
+        self.assertFalse(self.create_client().bucket(self.search_bucket)\
                              .search_enabled())
+        bucket.enable_search()
 
 
 class SolrSearchTests(object):