From 6c8a5723f8eeb0c8de1887c732e20ceaf81f7574 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 1 Oct 2020 08:32:01 -0500 Subject: [PATCH] Trying to add some long delays. --- api_tests/src/comment.spec.ts | 22 ++++++++++++---------- api_tests/src/follow.spec.ts | 4 +++- api_tests/src/post.spec.ts | 18 ++++++++++-------- api_tests/src/private_message.spec.ts | 7 ++++--- api_tests/src/shared.ts | 9 +++++++-- 5 files changed, 36 insertions(+), 24 deletions(-) diff --git a/api_tests/src/comment.spec.ts b/api_tests/src/comment.spec.ts index 5017c0fa4..2ee3045c7 100644 --- a/api_tests/src/comment.spec.ts +++ b/api_tests/src/comment.spec.ts @@ -1,4 +1,4 @@ -jest.setTimeout(120000); +jest.setTimeout(180000); import { alpha, beta, @@ -21,6 +21,7 @@ import { registerUser, API, delay, + longDelay, } from './shared'; import { Comment, @@ -35,7 +36,7 @@ beforeAll(async () => { await followBeta(alpha); await followBeta(gamma); let search = await searchForBetaCommunity(alpha); - await delay(10000); + await longDelay(); postRes = await createPost( alpha, search.communities.filter(c => c.local == false)[0].id @@ -66,7 +67,7 @@ test('Create a comment', async () => { expect(commentRes.comment.community_local).toBe(false); expect(commentRes.comment.creator_local).toBe(true); expect(commentRes.comment.score).toBe(1); - await delay(); + await longDelay(); // Make sure that comment is liked on beta let searchBeta = await searchComment(beta, commentRes.comment); @@ -147,7 +148,7 @@ test('Remove a comment from admin and community on the same instance', async () // The beta admin removes it (the community lives on beta) let removeCommentRes = await removeComment(beta, true, betaCommentId); expect(removeCommentRes.comment.removed).toBe(true); - await delay(); + await longDelay(); // Make sure that comment is removed on alpha (it gets pushed since an admin from beta removed it) let refetchedPost = await getPost(alpha, postRes.post.id); @@ -155,7 +156,7 @@ test('Remove a comment from admin and community on the same instance', async () let unremoveCommentRes = await removeComment(beta, false, betaCommentId); expect(unremoveCommentRes.comment.removed).toBe(false); - await delay(); + await longDelay(); // Make sure that comment is unremoved on beta let refetchedPost2 = await getPost(alpha, postRes.post.id); @@ -210,7 +211,7 @@ test('Unlike a comment', async () => { test('Federated comment like', async () => { let commentRes = await createComment(alpha, postRes.post.id); - await delay(); + await longDelay(); // Find the comment on beta let searchBeta = await searchComment(beta, commentRes.comment); @@ -218,7 +219,7 @@ test('Federated comment like', async () => { let like = await likeComment(beta, 1, betaComment); expect(like.comment.score).toBe(2); - await delay(); + await longDelay(); // Get the post from alpha, check the likes let post = await getPost(alpha, postRes.post.id); @@ -241,7 +242,7 @@ test('Reply to a comment', async () => { expect(replyRes.comment.creator_local).toBe(true); expect(replyRes.comment.parent_id).toBe(betaComment.id); expect(replyRes.comment.score).toBe(1); - await delay(); + await longDelay(); // Make sure that comment is seen on alpha // TODO not sure why, but a searchComment back to alpha, for the ap_id of betas @@ -310,7 +311,7 @@ test('A and G subscribe to B (center) A posts, G mentions B, it gets announced t expect(commentRes.comment.community_local).toBe(false); expect(commentRes.comment.creator_local).toBe(true); expect(commentRes.comment.score).toBe(1); - await delay(); + await longDelay(); // Make sure alpha sees it let alphaPost2 = await getPost(alpha, alphaPost.post.id); @@ -319,6 +320,7 @@ test('A and G subscribe to B (center) A posts, G mentions B, it gets announced t expect(alphaPost2.comments[0].creator_local).toBe(false); expect(alphaPost2.comments[0].score).toBe(1); assertCommentFederation(alphaPost2.comments[0], commentRes.comment); + await delay(); // Make sure beta has mentions let mentionsRes = await getMentions(beta); @@ -381,7 +383,7 @@ test('Fetch in_reply_tos: A is unsubbed from B, B makes a post, and some embedde // Get the post from alpha let search = await searchPost(alpha, postRes.post); let alphaPostB = search.posts[0]; - await delay(); + await longDelay(); let alphaPost = await getPost(alpha, alphaPostB.id); expect(alphaPost.post.name).toBeDefined(); diff --git a/api_tests/src/follow.spec.ts b/api_tests/src/follow.spec.ts index e238dc636..e0389f871 100644 --- a/api_tests/src/follow.spec.ts +++ b/api_tests/src/follow.spec.ts @@ -7,6 +7,7 @@ import { checkFollowedCommunities, unfollowRemotes, delay, + longDelay, } from './shared'; beforeAll(async () => { @@ -24,10 +25,11 @@ test('Follow federated community', async () => { // Make sure the follow response went through expect(follow.community.local).toBe(false); expect(follow.community.name).toBe('main'); - await delay(); + await longDelay(); // Check it from local let followCheck = await checkFollowedCommunities(alpha); + await delay(); let remoteCommunityId = followCheck.communities.filter( c => c.community_local == false )[0].community_id; diff --git a/api_tests/src/post.spec.ts b/api_tests/src/post.spec.ts index e62b6cce7..b964e72eb 100644 --- a/api_tests/src/post.spec.ts +++ b/api_tests/src/post.spec.ts @@ -20,6 +20,7 @@ import { getPost, unfollowRemotes, delay, + longDelay, } from './shared'; import { Post, @@ -31,7 +32,7 @@ beforeAll(async () => { await followBeta(gamma); await followBeta(delta); await followBeta(epsilon); - await delay(10000); + await longDelay(); }); afterAll(async () => { @@ -67,7 +68,7 @@ test('Create a post', async () => { expect(postRes.post.community_local).toBe(false); expect(postRes.post.creator_local).toBe(true); expect(postRes.post.score).toBe(1); - await delay(); + await longDelay(); // Make sure that post is liked on beta let searchBeta = await searchPost(beta, postRes.post); @@ -104,7 +105,7 @@ test('Unlike a post', async () => { // Try to unlike it again, make sure it stays at 0 let unlike2 = await likePost(alpha, 0, postRes.post); expect(unlike2.post.score).toBe(0); - await delay(); + await longDelay(); // Make sure that post is unliked on beta let searchBeta = await searchPost(beta, postRes.post); @@ -284,31 +285,32 @@ test('Remove a post from admin and community on different instance', async () => test('Remove a post from admin and community on same instance', async () => { let search = await searchForBetaCommunity(alpha); let postRes = await createPost(alpha, search.communities[0].id); - await delay(); + await longDelay(); // Get the id for beta let searchBeta = await searchPost(beta, postRes.post); let betaPost = searchBeta.posts[0]; - await delay(); + await longDelay(); // The beta admin removes it (the community lives on beta) let removePostRes = await removePost(beta, true, betaPost); expect(removePostRes.post.removed).toBe(true); - await delay(); + await longDelay(); // Make sure lemmy alpha sees post is removed let alphaPost = await getPost(alpha, postRes.post.id); expect(alphaPost.post.removed).toBe(true); assertPostFederation(alphaPost.post, removePostRes.post); - await delay(); + await longDelay(); // Undelete let undeletedPost = await removePost(beta, false, betaPost); expect(undeletedPost.post.removed).toBe(false); - await delay(); + await longDelay(); // Make sure lemmy alpha sees post is undeleted let alphaPost2 = await getPost(alpha, postRes.post.id); + await delay(); expect(alphaPost2.post.removed).toBe(false); assertPostFederation(alphaPost2.post, undeletedPost.post); }); diff --git a/api_tests/src/private_message.spec.ts b/api_tests/src/private_message.spec.ts index 75d1568ff..3ae714880 100644 --- a/api_tests/src/private_message.spec.ts +++ b/api_tests/src/private_message.spec.ts @@ -10,6 +10,7 @@ import { deletePrivateMessage, unfollowRemotes, delay, + longDelay, } from './shared'; let recipient_id: number; @@ -17,7 +18,7 @@ let recipient_id: number; beforeAll(async () => { await setupLogins(); let follow = await followBeta(alpha); - await delay(10000); + await longDelay(); recipient_id = follow.community.creator_id; }); @@ -46,7 +47,7 @@ test('Update a private message', async () => { let pmRes = await createPrivateMessage(alpha, recipient_id); let pmUpdated = await updatePrivateMessage(alpha, pmRes.message.id); expect(pmUpdated.message.content).toBe(updatedContent); - await delay(); + await longDelay(); let betaPms = await listPrivateMessages(beta); expect(betaPms.messages[0].content).toBe(updatedContent); @@ -74,7 +75,7 @@ test('Delete a private message', async () => { pmRes.message.id ); expect(undeletedPmRes.message.deleted).toBe(false); - await delay(); + await longDelay(); let betaPms3 = await listPrivateMessages(beta); expect(betaPms3.messages.length).toBe(betaPms1.messages.length); diff --git a/api_tests/src/shared.ts b/api_tests/src/shared.ts index bf75fa544..6aa5cfc4e 100644 --- a/api_tests/src/shared.ts +++ b/api_tests/src/shared.ts @@ -554,10 +554,15 @@ export async function followBeta(api: API): Promise { } } -export const delay = (millis: number = 1500) => - new Promise((resolve, _reject) => { +export function delay(millis: number = 500) { + return new Promise((resolve, _reject) => { setTimeout(_ => resolve(), millis); }); +} + +export function longDelay() { + return delay(10000); +} export function wrapper(form: any): string { return JSON.stringify(form);