Initial test for strong consistency

Author: Brett Hazen

riak/tests/__init__.py

@@ -39,6 +39,7 @@
 SKIP_POOL = os.environ.get('SKIP_POOL')
 SKIP_RESOLVE = int(os.environ.get('SKIP_RESOLVE', '0'))
 SKIP_BTYPES = int(os.environ.get('SKIP_BTYPES', '0'))
+RUN_CONSISTENCY = int(os.environ.get('RUN_CONSISTENCY', '0'))
 
 RUN_SECURITY = int(os.environ.get('RUN_SECURITY', '0'))
 SECURITY_USER = os.environ.get('RIAK_TEST_SECURITY_USER', 'testuser')

riak/tests/test_all.py

@@ -23,30 +23,33 @@
 from riak.tests.test_2i import TwoITests
 from riak.tests.test_btypes import BucketTypeTests
 from riak.tests.test_security import SecurityTests
+from riak.tests.test_consistency import StrongConsistencyTests
 
 from riak.tests import HOST, PB_HOST, PB_PORT, HTTP_HOST, HTTP_PORT, \
     HAVE_PROTO, DUMMY_HTTP_PORT, DUMMY_PB_PORT, \
-    SKIP_SEARCH, RUN_YZ, SECURITY_CREDS
+    SKIP_SEARCH, RUN_YZ, SECURITY_CREDS, RUN_CONSISTENCY
 
 testrun_search_bucket = None
 testrun_props_bucket = None
 testrun_sibs_bucket = None
 testrun_yz_bucket = None
 testrun_mr_btype = None
 testrun_mr_bucket = None
+testrun_consist_bucket = None
 
 
 def setUpModule():
     global testrun_search_bucket, testrun_props_bucket, \
         testrun_sibs_bucket, testrun_yz_bucket, testrun_mr_btype, \
-        testrun_mr_bucket
+        testrun_mr_bucket, testrun_consist_bucket
 
     c = RiakClient(protocol='pbc', host=PB_HOST, http_port=HTTP_PORT,
                    pb_port=PB_PORT, credentials=SECURITY_CREDS)
 
     testrun_props_bucket = 'propsbucket'
     testrun_sibs_bucket = 'sibsbucket'
     c.bucket(testrun_sibs_bucket).allow_mult = True
+    testrun_consist_bucket = 'pytest-consistent'
 
     if (not SKIP_SEARCH and not RUN_YZ):
         testrun_search_bucket = 'searchbucket'
@@ -82,7 +85,7 @@ def setUpModule():
 
 def tearDownModule():
     global testrun_search_bucket, testrun_props_bucket, \
-        testrun_sibs_bucket, testrun_yz_bucket
+        testrun_sibs_bucket, testrun_yz_bucket, testrun_consist_bucket
 
     c = RiakClient(protocol='http', host=HTTP_HOST, http_port=HTTP_PORT,
                    pb_port=PB_PORT, credentials=SECURITY_CREDS)
@@ -153,6 +156,7 @@ def setUp(self):
         self.mr_btype = testrun_mr_btype
         self.mr_bucket = testrun_mr_bucket
         self.credentials = SECURITY_CREDS
+        self.consistent_bucket = testrun_consist_bucket
 
         self.client = self.create_client()
 
@@ -314,6 +318,7 @@ class RiakPbcTransportTestCase(BasicKVTests,
                                CounterTests,
                                BucketTypeTests,
                                SecurityTests,
+                               StrongConsistencyTests,
                                BaseTestCase,
                                unittest.TestCase):
 
@@ -348,6 +353,7 @@ class RiakHttpTransportTestCase(BasicKVTests,
                                 CounterTests,
                                 BucketTypeTests,
                                 SecurityTests,
+                                StrongConsistencyTests,
                                 BaseTestCase,
                                 unittest.TestCase):
 

riak/tests/test_consistency.py

@@ -0,0 +1,52 @@
+"""
+Copyright 2014 Basho Technologies, Inc.
+
+This file is provided to you under the Apache License,
+Version 2.0 (the "License"); you may not use this file
+except in compliance with the License.  You may obtain
+a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+"""
+
+import platform
+if platform.python_version() < '2.7':
+    unittest = __import__('unittest2')
+else:
+    import unittest
+from riak.tests import RUN_CONSISTENCY
+
+
+class StrongConsistencyTests(object):
+    @unittest.skipUnless(RUN_CONSISTENCY, 'RUN_CONSISTENCY is undefined')
+    def test_consistency(self):
+        """
+        Test the case where strong consistency has been enabled.
+        """
+        btype = self.client.bucket_type(self.consistent_bucket)
+        bucket = btype.bucket(self.consistent_bucket)
+        key_name = self.randname()
+        rand = self.randint()
+        obj = bucket.new(key_name, rand)
+        obj.store()
+        read1 = bucket.get(key_name)
+        read2 = bucket.get(key_name)
+        rand1 = self.randint()
+        read1.data = rand1
+        read1.store()
+        read1.reload()
+        # read2 will have old VClock so write should fail
+        rand2 = self.randint()
+        read2.data = rand2
+        with self.assertRaises(Exception):
+            read2.store()
+
+    def test_consistency_empty_key(self):
+        pass