De-lager new tests

New tests have been added since the wday merge, so these have now been de-lagered.

There are a number of issues arising as these tests are run, documented in #21.

This commit provides initial workarounds to problems  highlighted in this issue with:
- location
- verify_riak_stats
- verify_2i_limit

.gitignore

@@ -47,6 +47,9 @@ erln8.config
 tags
 tmp/
 perf/*.beam
+*/group_tests/*
+*/results/*
+rebar.lock
 
 # ===== Project-specific Elements =====
 

group.sh

@@ -66,11 +66,7 @@ if [ -z "$CONFIG" ]; then
     die "No config specified (-c | --config)"
 fi
 
-if [ "$GROUP" != "yoko" ]; then
-    TEST_EBIN=_build/test/lib/riak_test/tests
-else
-    TEST_EBIN=~/yokozuna/riak_test/ebin
-fi
+TEST_EBIN=_build/prod/lib/riak_test/ebin
 
 LOG=$GROUP-$(date +"%FT%H%M")-${BACKEND:-default}
 

rebar.config

@@ -82,12 +82,14 @@
     {mapred_verify,
         {git, "https://github.com/nhs-riak/mapred_verify.git",
             {branch, "wday-develop-3.2"}}},
-    {riakhttpc,
-        {git, "https://github.com/nhs-riak/riak-erlang-http-client.git",
-            {branch, "nhse-d34-otp26"}}},
     {kvc,
         {git, "https://github.com/etrepum/kvc.git",
             {tag, "v1.7.0"}}},
+    {redbug,
+        {git, "https://github.com/massemanet/redbug.git", {branch, "master"}}}, 
+    {riakhttpc,
+        {git, "https://github.com/nhs-riak/riak-erlang-http-client.git",
+            {branch, "nhse-d34-otp26"}}},
     {kv_index_tictactree,
         {git, "https://github.com/nhs-riak/kv_index_tictactree.git",
             {branch, "nhse-develop"}}}
@@ -150,8 +152,8 @@
     {test, [
         {deps, [
             {meck,
-                {git, "https://github.com/nhs-riak/meck.git",
-                    {branch, "wday-develop-3.2"}}}
+                {git, "https://github.com/eproxus/meck.git",
+                    {branch, "master"}}}
         ]},
         {erl_opts, [
             %% Automatically defines 'TEST'
@@ -171,19 +173,16 @@
     %% Use 'check' for 'xref', 'dialyzer', or full compilation checks
     {check, [
         {deps, [
-            %% The rt_remote_lager module makes direct calls into lager on
-            %% test nodes < Riak 3.2. This allows their validity to be checked
-            %% to at least some extent. Lager compilation will generate some
-            %% warnings, but since we're never going to actually run the code
-            %% we don't care. Note use of the 3.0 branch, as that's the last
-            %% to be used in Riak.
-            {lager,
-                {git, "https://github.com/nhs-riak/lager.git",
-                    {branch, "wday-develop-3.0"}}},
             %% xref/dialyzer see into eunit tests, so include meck here, too.
             {meck,
-                {git, "https://github.com/nhs-riak/meck.git",
-                    {branch, "wday-develop-3.2"}}}
+                {git, "https://github.com/eproxus/meck.git",
+                    {branch, "master"}}},
+            {riak_kv,
+                {git, "https://github.com/nhs-riak/riak_kv.git",
+                    {branch, "nhse-d34-otp26"}}},
+            {riak_repl,
+                {git, "https://github.com/nhs-riak/riak_repl.git",
+                    {branch, "nhse-d34-otp26"}}}
         ]},
         {erl_opts, [
             {d, 'CHECK'},

src/riak_test.app.src

@@ -25,7 +25,10 @@
     {applications, [
         kernel,
         stdlib,
-        mapred_verify
+        inets,
+        tools,
+        mapred_verify,
+        kvc
     ]},
     {env, [
         %% Log formatter templates, used by multiple modules