summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/util_controller_test.exs
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-12-17 12:36:56 +0300
committerMaxim Filippov <colixer@gmail.com>2019-12-17 12:36:56 +0300
commit45180d4c6058f790475d8ff28018c912db105082 (patch)
treeb05758d7551ddfcc3b607538720f81db86b44ca9 /test/web/twitter_api/util_controller_test.exs
parenteb11c6028973b945361095d3f4791ac6f61379a9 (diff)
parent38ad407395e838ddf1c11922806adc080af44d36 (diff)
downloadpleroma-45180d4c6058f790475d8ff28018c912db105082.tar.gz
pleroma-45180d4c6058f790475d8ff28018c912db105082.zip
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
Diffstat (limited to 'test/web/twitter_api/util_controller_test.exs')
-rw-r--r--test/web/twitter_api/util_controller_test.exs2
1 files changed, 0 insertions, 2 deletions
diff --git a/test/web/twitter_api/util_controller_test.exs b/test/web/twitter_api/util_controller_test.exs
index 734cd2211..43299e147 100644
--- a/test/web/twitter_api/util_controller_test.exs
+++ b/test/web/twitter_api/util_controller_test.exs
@@ -898,8 +898,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|> post("/api/pleroma/delete_account", %{"password" => "test"})
assert json_response(conn, 200) == %{"status" => "success"}
- # Wait a second for the started task to end
- :timer.sleep(1000)
end
end
end