Skip to content

Commit 55b2bac

Browse files
Simon ZelaznyRafal Studnicki
authored andcommitted
Adapt test code to work with Elixir 1.2.2
1 parent 6481331 commit 55b2bac

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

test/phoenix/tracker/pool_test.exs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ defmodule Phoenix.Tracker.PoolTest do
3636
ref
3737
end
3838

39-
for {t, ref} <- Enum.zip([topics, refs]) do
39+
for {t, ref} <- List.zip([topics, refs]) do
4040
assert Tracker.list(server, t) == [{"me", %{name: "me", phx_ref: ref}}]
4141
end
4242
end
@@ -79,7 +79,7 @@ defmodule Phoenix.Tracker.PoolTest do
7979
new_ref
8080
end
8181

82-
expected_changes = Enum.zip([topics, old_refs, new_refs])
82+
expected_changes = List.zip([topics, old_refs, new_refs])
8383

8484
for {t, old_ref, new_ref} <- expected_changes do
8585
assert [{"me", %{new: "thing",
@@ -105,7 +105,7 @@ defmodule Phoenix.Tracker.PoolTest do
105105
new_ref
106106
end
107107

108-
expected_changes = Enum.zip([topics, old_refs, new_refs])
108+
expected_changes = List.zip([topics, old_refs, new_refs])
109109

110110
for {t, old_ref, new_ref} <- expected_changes do
111111
assert [{"me", %{a: "newval",
@@ -123,7 +123,7 @@ defmodule Phoenix.Tracker.PoolTest do
123123
{:ok, _ref} = Tracker.track(server, self(), t, "me", %{a: "b"})
124124
end
125125
:ok = Tracker.graceful_permdown(server)
126-
Process.sleep(n)
126+
:timer.sleep(n)
127127

128128
for t <- topics, do: assert Tracker.list(server, t) == []
129129
end

test/phoenix/tracker/shard_replication_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ defmodule Phoenix.Tracker.ShardReplicationTest do
213213
assert [{"local1", _}] = list(shard, topic)
214214
assert [{"local1", _}, {"node1", _}] = dirty_list(shard, topic)
215215

216-
Process.sleep(@permdown + 2*@heartbeat)
216+
:timer.sleep(@permdown + 2*@heartbeat)
217217
assert [{"local1", _}] = dirty_list(shard, topic)
218218
end
219219

0 commit comments

Comments
 (0)