Merge pull request akira#111 from akira/redis_test_cleanup

Cleanup Redis startup/shutdown in tests

test/config_test.exs

@@ -5,6 +5,7 @@ defmodule Exq.ConfigTest do
 
   setup_all do
     ExqTestUtil.reset_config
+    :ok
   end
 
   test "Mix.Config should change the host." do

test/exq_test.exs

@@ -165,7 +165,7 @@ defmodule ExqTest do
     {:ok, sup} = Exq.start_link([name: :exq_t, host: redis_host, port: redis_port, namespace: "test", queues: [{"q1", 1}, {"q2", 20}]])
     {:ok, _} = Exq.enqueue(:exq_t, "q1", ExqTest.SleepWorker, [40, :worked])
     {:ok, _} = Exq.enqueue(:exq_t, "q1", ExqTest.SleepWorker, [40, :worked2])
-    {:ok, _} = Exq.enqueue(:exq_t, "q1", ExqTest.SleepWorker, [100, :finished])
+    {:ok, _} = Exq.enqueue(:exq_t, "q1", ExqTest.SleepWorker, [100, :should_not_finish])
     # q2 should be clear
     {:ok, _} = Exq.enqueue(:exq_t, "q2", ExqTest.SleepWorker, [100, :q2_work])
     {:ok, _} = Exq.enqueue(:exq_t, "q2", ExqTest.SleepWorker, [100, :q2_work])
@@ -176,7 +176,7 @@ defmodule ExqTest do
 
     assert_received {"worked"}
     assert_received {"worked2"}
-    refute_received {"finished"}
+    refute_received {"should_not_finish"}
     assert_received {"q2_finished"}
     stop_process(sup)
   end

test/test_helper.exs

@@ -83,14 +83,14 @@ defmodule TestRedis do
   end
 
   def setup do
-    start
     {:ok, redis} = :eredis.start_link(redis_host, redis_port)
     Process.register(redis, :testredis)
+    flush_all
     :ok
   end
 
   def flush_all do
-      Connection.flushdb! :testredis
+    Connection.flushdb! :testredis
   end
 
   def teardown do
@@ -99,17 +99,23 @@ defmodule TestRedis do
       {:ok, redis} = :eredis.start_link(redis_host, redis_port)
       Process.register(redis, :testredis)
     end
-    flush_all
-    stop
     Process.unregister(:testredis)
     :ok
   end
 end
 
+
+
 # Don't run parallel tests to prevent redis issues
 ExUnit.configure(seed: 0, max_cases: 1)
 
 # Start logger
 :application.start(:logger)
 
+TestRedis.start
+
+System.at_exit fn(status) ->
+  TestRedis.stop
+end
+
 ExUnit.start