Merge pull request #499 from basho/fixes/lrb/travis-ci

Add security tests to Travis CI

Author: lukebakken

.runner

@@ -54,6 +54,8 @@ function lint
 
 function run_tests
 {
+    local protocol="${1:-pbc}"
+    export RIAK_TEST_PROTOCOL="$protocol"
     if [[ $have_tox == 'true' ]]
     then
         tox
@@ -73,16 +75,22 @@ function run_tests_each_protocol
 {
     for protocol in pbc http
     do
-        export RIAK_TEST_PROTOCOL="$protocol"
-        run_tests
+        run_tests "$protocol"
     done
 }
 
-function export_test_environment_vars
+function export_host_environment_vars
 {
     local riak_test_host="${RIAK_TEST_HOST:-localhost}"
     local -i riak_test_pb_port="${RIAK_TEST_PB_PORT:-8087}"
     local -i riak_test_http_port="${RIAK_TEST_HTTP_PORT:-8098}"
+    export RIAK_TEST_HOST="$riak_test_host"
+    export RIAK_TEST_PB_PORT="$riak_test_pb_port"
+    export RIAK_TEST_HTTP_PORT="$riak_test_http_port"
+}
+
+function export_test_environment_vars
+{
     export RUN_BTYPES=1
     export RUN_CLIENT=1
     export RUN_DATATYPES=1
@@ -92,19 +100,30 @@ function export_test_environment_vars
     export RUN_RESOLVE=1
     export RUN_TIMESERIES=1
     export RUN_YZ=1
-    export RIAK_TEST_HOST="$riak_test_host"
-    export RIAK_TEST_PB_PORT="$riak_test_pb_port"
-    export RIAK_TEST_HTTP_PORT="$riak_test_http_port"
+}
+
+function unexport_test_environment_vars
+{
+    export RUN_BTYPES=0
+    export RUN_CLIENT=0
+    export RUN_DATATYPES=0
+    export RUN_INDEXES=0
+    export RUN_KV=0
+    export RUN_MAPREDUCE=0
+    export RUN_RESOLVE=0
+    export RUN_TIMESERIES=0
+    export RUN_YZ=0
 }
 
 function security_test
 {
     if [[ $have_riak_admin == 'true' ]]
     then
-        export_test_environment_vars
+        export_host_environment_vars
+        unexport_test_environment_vars
         export RUN_SECURITY=1
         $riak_admin security enable
-        run_tests_each_protocol
+        run_tests 'pbc'
     else
         echo '[ERROR] riak-admin must be in PATH, RIAK_ADMIN var set to path, or RIAK_DIR set.' 1>&2
         exit 1
@@ -113,6 +132,7 @@ function security_test
 
 function integration_test
 {
+    export_host_environment_vars
     export_test_environment_vars
     run_tests_each_protocol
 }

.travis.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -o errexit
+
+flake8 --exclude=riak/pb riak *.py
+
+sudo riak-admin security disable
+
+python setup.py test
+
+sudo riak-admin security enable
+
+if [[ $RIAK_TEST_PROTOCOL == 'pbc' ]]
+then
+    export RUN_SECURITY=1
+    python setup.py test --test-suite riak.tests.test_security
+else
+    echo '[INFO]: security tests run on PB protocol only'
+fi

.travis.yml

@@ -7,11 +7,14 @@ python:
   - '3.4'
   - '3.5'
   - nightly
+addons:
+  hosts:
+    - riak-test
 install:
   - pip install --upgrade pip setuptools flake8
 before_script:
   - sudo ./tools/travis-ci/riak-install -d "$RIAK_DOWNLOAD_URL"
-  - sudo ./tools/setup-riak
+  - sudo ./tools/setup-riak -s
 env:
   matrix:
     - 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
@@ -29,9 +32,9 @@ env:
     - RUN_YZ=1
     - RUN_DATATYPES=1
     - RUN_INDEXES=1
+    - RUN_SECURITY=0
 script:
-  - flake8 --exclude=riak/pb riak *.py
-  - python setup.py test
+  - ./.travis.sh
 notifications:
   slack:
     secure: kU1XcvTAliCWKuYpMWEMbD4qkbmlnWGLAIKbBQjtIh5ZRzISgjdUFzGcC31eHoQFv12LQdp5KAFj0Y1FyEvLxi0W8VeWKpsBGc06ntuECaN9MNHRBzKKclrTMGTfpBWZ5IO17XSUu2lKaNz6GDGRkiZA+sxYAVPfZSXY3u86IuY=

riak/tests/__init__.py

@@ -40,10 +40,10 @@ def hostname_resolves(hostname):
 PROTOCOL = os.environ.get('RIAK_TEST_PROTOCOL', 'pbc')
 
 PB_HOST = os.environ.get('RIAK_TEST_PB_HOST', HOST)
-PB_PORT = int(os.environ.get('RIAK_TEST_PB_PORT', '10017'))
+PB_PORT = int(os.environ.get('RIAK_TEST_PB_PORT', '8087'))
 
 HTTP_HOST = os.environ.get('RIAK_TEST_HTTP_HOST', HOST)
-HTTP_PORT = int(os.environ.get('RIAK_TEST_HTTP_PORT', '10018'))
+HTTP_PORT = int(os.environ.get('RIAK_TEST_HTTP_PORT', '8098'))
 
 # these ports are used to simulate errors, there shouldn't
 # be anything listening on either port.