Merge pull request #495 from basho/features/lrb/test-supported-riak-versions

Switch to using dpkg for installing Riak, use 2.0.7 and 2.1.4

Author: lukebakken

.travis.yml

@@ -2,34 +2,36 @@ sudo: required
 dist: trusty
 language: python
 python:
-- '2.7'
-- '3.3'
-- '3.4'
-- '3.5'
-- nightly
+  - '2.7'
+  - '3.3'
+  - '3.4'
+  - '3.5'
+  - nightly
 install:
-- pip install --upgrade flake8
+  - pip install --upgrade flake8
 before_script:
-- sudo ./tools/travis-ci/riak-install
-- sudo ./tools/devrel/riak-cluster-config "$(which riak-admin)" 8098 false false
+  - sudo ./tools/travis-ci/riak-install -d "$RIAK_DOWNLOAD_URL"
+  - sudo ./tools/devrel/riak-cluster-config "$(which riak-admin)" 8098 false false
 env:
   matrix:
-  - RIAK_TEST_PROTOCOL=pbc
-  - RIAK_TEST_PROTOCOL=http
+    - RIAK_TEST_PROTOCOL=pbc  RIAK_DOWNLOAD_URL=http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.7/ubuntu/trusty/riak_2.0.7-1_amd64.deb
+    - RIAK_TEST_PROTOCOL=http RIAK_DOWNLOAD_URL=http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.7/ubuntu/trusty/riak_2.0.7-1_amd64.deb
+    - RIAK_TEST_PROTOCOL=pbc  RIAK_DOWNLOAD_URL=http://s3.amazonaws.com/downloads.basho.com/riak/2.1/2.1.4/ubuntu/trusty/riak_2.1.4-1_amd64.deb
+    - RIAK_TEST_PROTOCOL=http RIAK_DOWNLOAD_URL=http://s3.amazonaws.com/downloads.basho.com/riak/2.1/2.1.4/ubuntu/trusty/riak_2.1.4-1_amd64.deb
   global:
-  - RIAK_TEST_PB_PORT=8087
-  - RIAK_TEST_HTTP_PORT=8098
-  - RUN_BTYPES=1
-  - RUN_CLIENT=1
-  - RUN_MAPREDUCE=1
-  - RUN_KV=1
-  - RUN_RESOLVE=1
-  - RUN_YZ=1
-  - RUN_DATATYPES=1
-  - RUN_INDEXES=1
+    - RIAK_TEST_PB_PORT=8087
+    - RIAK_TEST_HTTP_PORT=8098
+    - RUN_BTYPES=1
+    - RUN_CLIENT=1
+    - RUN_MAPREDUCE=1
+    - RUN_KV=1
+    - RUN_RESOLVE=1
+    - RUN_YZ=1
+    - RUN_DATATYPES=1
+    - RUN_INDEXES=1
 script:
-- flake8 --exclude=riak/pb riak *.py
-- python setup.py test
+  - flake8 --exclude=riak/pb riak *.py
+  - python setup.py test
 notifications:
   slack:
     secure: kU1XcvTAliCWKuYpMWEMbD4qkbmlnWGLAIKbBQjtIh5ZRzISgjdUFzGcC31eHoQFv12LQdp5KAFj0Y1FyEvLxi0W8VeWKpsBGc06ntuECaN9MNHRBzKKclrTMGTfpBWZ5IO17XSUu2lKaNz6GDGRkiZA+sxYAVPfZSXY3u86IuY=

riak/tests/test_btypes.py

@@ -155,7 +155,10 @@ def test_write_once_bucket_type(self):
         skey = 'write_once-init'
         btype = self.client.bucket_type(bt)
         bucket = btype.bucket(bt)
-        sobj = bucket.get(skey)
+        try:
+            sobj = bucket.get(skey)
+        except RiakError as e:
+            raise unittest.SkipTest(e)
         if not sobj.exists:
             for i in range(100):
                 o = bucket.new(self.key_name + str(i))

riak/tests/test_kv.py

@@ -616,16 +616,19 @@ def test_get_params(self):
         self.assertFalse(missing.exists)
 
     def test_preflist(self):
+        nodes = ['[email protected]', '[email protected]']
         bucket = self.client.bucket(self.bucket_name)
         bucket.new(self.key_name, data={"foo": "one",
                                         "bar": "baz"}).store()
-        preflist = bucket.get_preflist(self.key_name)
-        preflist2 = self.client.get_preflist(bucket, self.key_name)
-        nodes = ['[email protected]', '[email protected]']
-        for pref in (preflist, preflist2):
-            self.assertEqual(len(pref), 3)
-            self.assertIn(pref[0]['node'], nodes)
-            [self.assertTrue(node['primary']) for node in pref]
+        try:
+            preflist = bucket.get_preflist(self.key_name)
+            preflist2 = self.client.get_preflist(bucket, self.key_name)
+            for pref in (preflist, preflist2):
+                self.assertEqual(len(pref), 3)
+                self.assertIn(pref[0]['node'], nodes)
+                [self.assertTrue(node['primary']) for node in pref]
+        except NotImplementedError as e:
+            raise unittest.SkipTest(e)
 
     def generate_siblings(self, original, count=5, delay=None):
         vals = []

riak/transports/http/transport.py

@@ -770,6 +770,8 @@ def get_preflist(self, bucket, key):
         :type key: string
         :rtype: list of dicts
         """
+        if not self.preflists():
+            raise NotImplementedError("fetching preflists is not supported.")
         bucket_type = self._get_bucket_type(bucket.bucket_type)
         url = self.preflist_path(bucket.name, key, bucket_type=bucket_type)
         status, headers, body = self._request('GET', url)

riak/transports/tcp/transport.py

@@ -526,6 +526,8 @@ def get_preflist(self, bucket, key):
         :type key: string
         :rtype: list of dicts
         """
+        if not self.preflists():
+            raise NotImplementedError("fetching preflists is not supported.")
         msg_code = riak.pb.messages.MSG_CODE_GET_BUCKET_KEY_PREFLIST_REQ
         codec = self._get_codec(msg_code)
         msg = codec.encode_get_preflist(bucket, key)