Exclude complex distributed tests from Travis CI

.travis.yml

@@ -1,4 +1,7 @@
 language: erlang
+script:
+  - rebar compile -DDEBUG
+  - rebar skip_deps=true eunit -DDEBUG -DTRAVIS_CI
 otp_release:
   - 17.1
   - 17.0

test/lbm_kv_dist_test.erl

@@ -36,10 +36,19 @@ all_test_() ->
     {foreach, setup(), teardown(),
      [
       {timeout, 10, [fun unique_table/0]},
-      {timeout, 10, [fun simple_netsplit/0]},
+      {timeout, 10, [fun simple_netsplit/0]}
+     ]}.
+
+-ifndef(TRAVIS_CI).
+
+additional_test_() ->
+    {foreach, setup(), teardown(),
+     [
       {timeout, 10, [fun resolve_conflict/0]}
      ]}.
 
+-endif.
+
 unique_table() ->
     process_flag(trap_exit, true),
 
@@ -167,6 +176,7 @@ simple_netsplit() ->
 
     ok.
 
+%% Due to race conditions this test may sometimes produce false positives.
 resolve_conflict() ->
     process_flag(trap_exit, true),
 
@@ -183,7 +193,7 @@ resolve_conflict() ->
     ?assertEqual(ok, slave_execute(Slave2, Create)),
 
     %% Put the key from local node
-    PutKey = fun() -> {ok, _} = lbm_kv:put(?MODULE, key, node()) end,
+    PutKey = fun() -> {ok, _} = lbm_kv:put(?MODULE, key, value) end,
     PutKey(),
 
     %% Ensure the key from slaves
@@ -198,7 +208,6 @@ resolve_conflict() ->
                        {ok, _} = mnesia:subscribe(system),
                        true = net_kernel:disconnect(OtherSlave),
 
-                       PutKey(),
                        PutOther(),
 
                        true = net_kernel:connect(OtherSlave),
@@ -210,7 +219,7 @@ resolve_conflict() ->
     %% sorry, but there's no event we can wait for...
     timer:sleep(1000),
 
-    GetKey = fun() -> {ok, _} = lbm_kv:get(?MODULE, key) end,
+    GetKey = fun() -> {ok, [{key, value}]} = lbm_kv:get(?MODULE, key) end,
     GetKey(),
     ok = slave_execute(Slave1, GetKey),
     ok = slave_execute(Slave2, GetKey),
@@ -222,9 +231,9 @@ resolve_conflict() ->
 
     ok.
 
-%% custome conflict resolution for resolve_conflict/0 test.
-resolve_conflict(key, _Local, _Remote) ->
-    delete;
+%% custom conflict resolution for resolve_conflict/0 test.
+resolve_conflict(key, _Local, Remote) ->
+    {value, Remote};
 resolve_conflict(other, _Local, _Remote) ->
     {value, new}.