Merge branch 'master' of github.com:processone/ejabberd

test/acl_test.exs

@@ -25,7 +25,7 @@ defmodule ACLTest do
 
   setup_all do
     :ok = :mnesia.start
-    :ok = :jid.start
+    {:ok, _} = :jid.start
     :stringprep.start
     :ok = :ejabberd_config.start(["domain1", "domain2"], [])
     :ok = :acl.start

test/ejabberd_commands_mock_test.exs

@@ -48,7 +48,7 @@ defmodule EjabberdCommandsMockTest do
 			_ -> :ok
 		end
 		:mnesia.start
-    :ok = :jid.start
+    {:ok, _} = :jid.start
     :ok = :ejabberd_config.start(["domain1", "domain2"], [])
     {:ok, _} = :ejabberd_access_permissions.start_link()
     :ok = :acl.start

test/ejabberd_cyrsasl_test.exs

@@ -27,7 +27,7 @@ defmodule EjabberdCyrsaslTest do
     :p1_sha.load_nif()
     :mnesia.start
     :ok = start_module(:stringprep)
-    :ok = start_module(:jid)
+    {:ok, _} = start_module(:jid)
     :ok = :ejabberd_config.start(["domain1"], [])
     :ok = :cyrsasl.start
     cyrstate = :cyrsasl.server_new("domain1", "domain1", "domain1", :ok, &get_password/1,

test/jid_test.exs

@@ -29,6 +29,7 @@ defmodule JidTest do
   setup_all do
     :stringprep.start
     :jid.start
+    :ok
   end
 
   test "create a jid from a binary" do

test/mod_admin_extra_test.exs

@@ -38,7 +38,7 @@ defmodule EjabberdModAdminExtraTest do
 
 	setup_all do
 		try do
-      :jid.start
+			:jid.start
 			:stringprep.start
 			:mnesia.start
 			:p1_sha.load_nif