Name
@@ -94,7 +94,4 @@ defmodule LivebookWeb.SessionLive.AttachedLive do
end
defp runtime_error_to_message(:unreachable), do: "Node unreachable"
-
- defp runtime_error_to_message(:already_in_use),
- do: "Another session is already connected to this node"
end
diff --git a/test/livebook/runtime/elixir_standalone_test.exs b/test/livebook/runtime/elixir_standalone_test.exs
index f4ed46b85..29d50bfa9 100644
--- a/test/livebook/runtime/elixir_standalone_test.exs
+++ b/test/livebook/runtime/elixir_standalone_test.exs
@@ -4,7 +4,7 @@ defmodule Livebook.Runtime.ElixirStandaloneTest do
alias Livebook.Runtime
describe "init/1" do
- test "starts a new Elixir runtime in distribution mode and ties its lifetime to the Manager process" do
+ test "starts a new Elixir runtime in distribution mode and ties its lifetime to the NodeManager process" do
assert {:ok, %{node: node} = runtime} = Runtime.ElixirStandalone.init()
Runtime.connect(runtime)
@@ -12,10 +12,11 @@ defmodule Livebook.Runtime.ElixirStandaloneTest do
Node.monitor(node, true)
assert :pong = Node.ping(node)
- # Tell the owner process to stop.
- Livebook.Runtime.ErlDist.Manager.stop(node)
+ # Kill the manager process.
+ pid = :rpc.call(node, Process, :whereis, [Livebook.Runtime.ErlDist.NodeManager])
+ Process.exit(pid, :kill)
- # Once Manager terminates, the node should terminate as well.
+ # Once NodeManager terminates, the node should terminate as well.
assert_receive {:nodedown, ^node}
end
@@ -46,6 +47,6 @@ defmodule Livebook.Runtime.ElixirStandaloneTest do
end
defp manager_started?(node) do
- :rpc.call(node, Process, :whereis, [Livebook.Runtime.ErlDist.Manager]) != nil
+ :rpc.call(node, Process, :whereis, [Livebook.Runtime.ErlDist.NodeManager]) != nil
end
end
diff --git a/test/livebook/runtime/erl_dist/manager_test.exs b/test/livebook/runtime/erl_dist/manager_test.exs
deleted file mode 100644
index 11a021a5c..000000000
--- a/test/livebook/runtime/erl_dist/manager_test.exs
+++ /dev/null
@@ -1,132 +0,0 @@
-defmodule Livebook.Runtime.ErlDist.ManagerTest do
- use ExUnit.Case, async: false
-
- alias Livebook.Runtime.ErlDist.Manager
-
- describe "set_owner/2" do
- test "starts watching the given process and terminates as soon as it terminates" do
- Manager.start()
-
- owner =
- spawn(fn ->
- receive do
- :stop -> :ok
- end
- end)
-
- Manager.set_owner(node(), owner)
-
- # Make sure the node is running.
- assert Process.whereis(Livebook.Runtime.ErlDist.Manager) != nil
- ref = Process.monitor(Livebook.Runtime.ErlDist.Manager)
-
- # Tell the owner process to stop.
- send(owner, :stop)
-
- # Once the owner process terminates, the node should terminate as well.
- assert_receive {:DOWN, ^ref, :process, _, _}
- end
- end
-
- describe "evaluate_code/6" do
- test "spawns a new evaluator when necessary" do
- Manager.start()
- Manager.set_owner(node(), self())
- Manager.evaluate_code(node(), "1 + 1", :container1, :evaluation1, nil)
-
- assert_receive {:evaluation_response, :evaluation1, _, %{evaluation_time_ms: _time_ms}}
-
- Manager.stop(node())
- end
-
- test "prevents from module redefinition warning being printed to standard error" do
- Manager.start()
- Manager.set_owner(node(), self())
-
- stderr =
- ExUnit.CaptureIO.capture_io(:stderr, fn ->
- Manager.evaluate_code(node(), "defmodule Foo do end", :container1, :evaluation1, nil)
- Manager.evaluate_code(node(), "defmodule Foo do end", :container1, :evaluation2, nil)
-
- assert_receive {:evaluation_response, :evaluation1, _, %{evaluation_time_ms: _time_ms}}
- assert_receive {:evaluation_response, :evaluation2, _, %{evaluation_time_ms: _time_ms}}
- end)
-
- assert stderr == ""
-
- Manager.stop(node())
- end
-
- test "proxies evaluation stderr to evaluation stdout" do
- Manager.start()
- Manager.set_owner(node(), self())
-
- Manager.evaluate_code(node(), ~s{IO.puts(:stderr, "error")}, :container1, :evaluation1, nil)
-
- assert_receive {:evaluation_output, :evaluation1, "error\n"}
-
- Manager.stop(node())
- end
-
- @tag capture_log: true
- test "proxies logger messages to evaluation stdout" do
- Manager.start()
- Manager.set_owner(node(), self())
-
- code = """
- require Logger
- Logger.error("hey")
- """
-
- Manager.evaluate_code(node(), code, :container1, :evaluation1, nil)
-
- assert_receive {:evaluation_output, :evaluation1, log_message}
- assert log_message =~ "[error] hey"
-
- Manager.stop(node())
- end
- end
-
- describe "request_completion_items/6" do
- test "provides basic completion when no evaluation reference is given" do
- Manager.start()
- Manager.set_owner(node(), self())
-
- Manager.request_completion_items(node(), self(), :comp_ref, "System.ver", nil, nil)
- assert_receive {:completion_response, :comp_ref, [%{label: "version/0"}]}
-
- Manager.stop(node())
- end
-
- test "provides extended completion when previous evaluation reference is given" do
- Manager.start()
- Manager.set_owner(node(), self())
-
- Manager.evaluate_code(node(), "number = 10", :c1, :e1, nil)
- assert_receive {:evaluation_response, :e1, _, %{evaluation_time_ms: _time_ms}}
-
- Manager.request_completion_items(node(), self(), :comp_ref, "num", :c1, :e1)
-
- assert_receive {:completion_response, :comp_ref, [%{label: "number"}]}
-
- Manager.stop(node())
- end
- end
-
- @tag capture_log: true
- test "notifies the owner when an evaluator goes down" do
- Manager.start()
- Manager.set_owner(node(), self())
-
- code = """
- spawn_link(fn -> raise "sad cat" end)
- """
-
- Manager.evaluate_code(node(), code, :container1, :evaluation1, nil)
-
- assert_receive {:container_down, :container1, message}
- assert message =~ "sad cat"
-
- Manager.stop(node())
- end
-end
diff --git a/test/livebook/runtime/erl_dist/node_manager_test.exs b/test/livebook/runtime/erl_dist/node_manager_test.exs
new file mode 100644
index 000000000..3cf99d248
--- /dev/null
+++ b/test/livebook/runtime/erl_dist/node_manager_test.exs
@@ -0,0 +1,21 @@
+defmodule Livebook.Runtime.ErlDist.NodeManagerTest do
+ use ExUnit.Case, async: false
+
+ alias Livebook.Runtime.ErlDist.{NodeManager, RuntimeServer}
+
+ test "terminates when the last runtime server terminates" do
+ {:ok, manager_pid} =
+ NodeManager.start_link(unload_modules_on_termination: false, anonymous: true)
+
+ server1 = NodeManager.start_runtime_server(manager_pid)
+ server2 = NodeManager.start_runtime_server(manager_pid)
+
+ ref = Process.monitor(manager_pid)
+
+ RuntimeServer.stop(server1)
+ assert Process.alive?(manager_pid)
+
+ RuntimeServer.stop(server2)
+ assert_receive {:DOWN, ^ref, :process, _, _}
+ end
+end
diff --git a/test/livebook/runtime/erl_dist/runtime_server_test.exs b/test/livebook/runtime/erl_dist/runtime_server_test.exs
new file mode 100644
index 000000000..95193b2c3
--- /dev/null
+++ b/test/livebook/runtime/erl_dist/runtime_server_test.exs
@@ -0,0 +1,110 @@
+defmodule Livebook.Runtime.ErlDist.RuntimeServerTest do
+ use ExUnit.Case, async: false
+
+ alias Livebook.Runtime.ErlDist.{NodeManager, RuntimeServer}
+
+ setup do
+ {:ok, manager_pid} =
+ NodeManager.start_link(unload_modules_on_termination: false, anonymous: true)
+
+ runtime_server_pid = NodeManager.start_runtime_server(manager_pid)
+ RuntimeServer.set_owner(runtime_server_pid, self())
+ {:ok, %{pid: runtime_server_pid}}
+ end
+
+ describe "set_owner/2" do
+ test "starts watching the given process and terminates as soon as it terminates", %{pid: pid} do
+ owner =
+ spawn(fn ->
+ receive do
+ :stop -> :ok
+ end
+ end)
+
+ RuntimeServer.set_owner(pid, owner)
+
+ # Make sure the node is running.
+ assert Process.alive?(pid)
+ ref = Process.monitor(pid)
+
+ # Tell the owner process to stop.
+ send(owner, :stop)
+
+ # Once the owner process terminates, the node should terminate as well.
+ assert_receive {:DOWN, ^ref, :process, _, _}
+ end
+ end
+
+ describe "evaluate_code/6" do
+ test "spawns a new evaluator when necessary", %{pid: pid} do
+ RuntimeServer.evaluate_code(pid, "1 + 1", :container1, :evaluation1, nil)
+
+ assert_receive {:evaluation_response, :evaluation1, _, %{evaluation_time_ms: _time_ms}}
+ end
+
+ test "prevents from module redefinition warning being printed to standard error", %{pid: pid} do
+ stderr =
+ ExUnit.CaptureIO.capture_io(:stderr, fn ->
+ RuntimeServer.evaluate_code(pid, "defmodule Foo do end", :container1, :evaluation1, nil)
+ RuntimeServer.evaluate_code(pid, "defmodule Foo do end", :container1, :evaluation2, nil)
+
+ assert_receive {:evaluation_response, :evaluation1, _, %{evaluation_time_ms: _time_ms}}
+ assert_receive {:evaluation_response, :evaluation2, _, %{evaluation_time_ms: _time_ms}}
+ end)
+
+ assert stderr == ""
+ end
+
+ test "proxies evaluation stderr to evaluation stdout", %{pid: pid} do
+ RuntimeServer.evaluate_code(
+ pid,
+ ~s{IO.puts(:stderr, "error")},
+ :container1,
+ :evaluation1,
+ nil
+ )
+
+ assert_receive {:evaluation_output, :evaluation1, "error\n"}
+ end
+
+ @tag capture_log: true
+ test "proxies logger messages to evaluation stdout", %{pid: pid} do
+ code = """
+ require Logger
+ Logger.error("hey")
+ """
+
+ RuntimeServer.evaluate_code(pid, code, :container1, :evaluation1, nil)
+
+ assert_receive {:evaluation_output, :evaluation1, log_message}
+ assert log_message =~ "[error] hey"
+ end
+ end
+
+ describe "request_completion_items/6" do
+ test "provides basic completion when no evaluation reference is given", %{pid: pid} do
+ RuntimeServer.request_completion_items(pid, self(), :comp_ref, "System.ver", nil, nil)
+ assert_receive {:completion_response, :comp_ref, [%{label: "version/0"}]}
+ end
+
+ test "provides extended completion when previous evaluation reference is given", %{pid: pid} do
+ RuntimeServer.evaluate_code(pid, "number = 10", :c1, :e1, nil)
+ assert_receive {:evaluation_response, :e1, _, %{evaluation_time_ms: _time_ms}}
+
+ RuntimeServer.request_completion_items(pid, self(), :comp_ref, "num", :c1, :e1)
+
+ assert_receive {:completion_response, :comp_ref, [%{label: "number"}]}
+ end
+ end
+
+ test "notifies the owner when an evaluator goes down", %{pid: pid} do
+ code = """
+ spawn_link(fn -> Process.exit(self(), :kill) end)
+ """
+
+ RuntimeServer.evaluate_code(pid, code, :container1, :evaluation1, nil)
+
+ assert_receive {:container_down, :container1, message}
+ assert message =~ "killed"
+ end
+end
diff --git a/test/livebook/runtime/mix_standalone_test.exs b/test/livebook/runtime/mix_standalone_test.exs
index b8d31d0c1..749d6f4dc 100644
--- a/test/livebook/runtime/mix_standalone_test.exs
+++ b/test/livebook/runtime/mix_standalone_test.exs
@@ -38,6 +38,6 @@ defmodule Livebook.Runtime.MixStandaloneTest do
end
defp manager_started?(node) do
- :rpc.call(node, Process, :whereis, [Livebook.Runtime.ErlDist.Manager]) != nil
+ :rpc.call(node, Process, :whereis, [Livebook.Runtime.ErlDist.NodeManager]) != nil
end
end