summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-04-08 11:42:20 +0000
committerlambda <lain@soykaf.club>2019-04-08 11:42:20 +0000
commite19590c93f9adc5d743867b048aad9528810fc53 (patch)
tree7e3c4e5849a2b5303149b582d788cc108e0b9d69 /test
parentfd45cab9eccecc835dde457d72ba38bd31c8f7f6 (diff)
parentb4da2bc1d009ecca0d7821abe3577d1a920c41c0 (diff)
downloadpleroma-e19590c93f9adc5d743867b048aad9528810fc53.tar.gz
pleroma-e19590c93f9adc5d743867b048aad9528810fc53.zip
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019
Diffstat (limited to 'test')
-rw-r--r--test/web/activity_pub/transmogrifier_test.exs3
1 files changed, 0 insertions, 3 deletions
diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs
index 62b973c4f..47cffe257 100644
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -1028,9 +1028,6 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
assert user.info.note_count == 1
assert user.follower_address == "https://niu.moe/users/rye/followers"
- # Wait for the background task
- :timer.sleep(1000)
-
user = User.get_by_id(user.id)
assert user.info.note_count == 1