From 33bd8fbffea79b8ca510a098ad4654b8f01324d6 Mon Sep 17 00:00:00 2001 From: Alexander Strizhakov Date: Tue, 28 Jan 2020 18:02:11 +0300 Subject: filename and test fixes --- mix.exs | 2 +- restarter/mix .exs | 21 --------------------- restarter/mix.exs | 21 +++++++++++++++++++++ test/config/transfer_task_test.exs | 5 ++++- 4 files changed, 26 insertions(+), 23 deletions(-) delete mode 100644 restarter/mix .exs create mode 100644 restarter/mix.exs diff --git a/mix.exs b/mix.exs index 2608f986e..8cbea6f75 100644 --- a/mix.exs +++ b/mix.exs @@ -172,7 +172,7 @@ defmodule Pleroma.Mixfile do git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git", ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"}, {:mox, "~> 0.5", only: :test}, - {:restarter, path: "../restarter"} + {:restarter, path: "./restarter"} ] ++ oauth_deps() end diff --git a/restarter/mix .exs b/restarter/mix .exs deleted file mode 100644 index b0908aece..000000000 --- a/restarter/mix .exs +++ /dev/null @@ -1,21 +0,0 @@ -defmodule Restarter.MixProject do - use Mix.Project - - def project do - [ - app: :restarter, - version: "0.1.0", - elixir: "~> 1.8", - start_permanent: Mix.env() == :prod, - deps: deps() - ] - end - - def application do - [ - mod: {Restarter, []} - ] - end - - defp deps, do: [] -end diff --git a/restarter/mix.exs b/restarter/mix.exs new file mode 100644 index 000000000..b0908aece --- /dev/null +++ b/restarter/mix.exs @@ -0,0 +1,21 @@ +defmodule Restarter.MixProject do + use Mix.Project + + def project do + [ + app: :restarter, + version: "0.1.0", + elixir: "~> 1.8", + start_permanent: Mix.env() == :prod, + deps: deps() + ] + end + + def application do + [ + mod: {Restarter, []} + ] + end + + defp deps, do: [] +end diff --git a/test/config/transfer_task_test.exs b/test/config/transfer_task_test.exs index 61ab1440d..ebdc951cf 100644 --- a/test/config/transfer_task_test.exs +++ b/test/config/transfer_task_test.exs @@ -172,7 +172,10 @@ defmodule Pleroma.Config.TransferTaskTest do value: [seconds_valid: 60] }) - assert capture_log(fn -> TransferTask.load_and_update_env([], false) end) =~ "" + refute String.contains?( + capture_log(fn -> TransferTask.load_and_update_env([], false) end), + "pleroma restarted" + ) end end end -- cgit v1.2.3