summaryrefslogtreecommitdiff
path: root/internal/processing/account/move_test.go
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2024-04-26 13:50:46 +0100
committerLibravatar GitHub <noreply@github.com>2024-04-26 13:50:46 +0100
commitc9c0773f2c2363dcfa37e675b83ec3f0b49bd0d9 (patch)
treedbd3409070765d5ca81448a574ccd32b4da1ffe6 /internal/processing/account/move_test.go
parent[chore] update Docker container to use new go swagger hash (#2872) (diff)
downloadgotosocial-c9c0773f2c2363dcfa37e675b83ec3f0b49bd0d9.tar.xz
[performance] update remaining worker pools to use queues (#2865)
* start replacing client + federator + media workers with new worker + queue types * refactor federatingDB.Delete(), drop queued messages when deleting account / status * move all queue purging to the processor workers * undo toolchain updates * code comments, ensure dereferencer worker pool gets started * update gruf libraries in readme * start the job scheduler separately to the worker pools * reshuffle ordering or server.go + remove duplicate worker start / stop * update go-list version * fix vendoring * move queue invalidation to before wipeing / deletion, to ensure queued work not dropped * add logging to worker processing functions in testrig, don't start workers in unexpected places * update go-structr to add (+then rely on) QueueCtx{} type * ensure more worker pools get started properly in tests * fix remaining broken tests relying on worker queue logic * fix account test suite queue popping logic, ensure noop workers do not pull from queue * move back accidentally shuffled account deletion order * ensure error (non nil!!) gets passed in refactored federatingDB{}.Delete() * silently drop deletes from accounts not permitted to * don't warn log on forwarded deletes * make if else clauses easier to parse * use getFederatorMsg() * improved code comment * improved code comment re: requesting account delete checks * remove boolean result from worker start / stop since false = already running or already stopped * remove optional passed-in http.client * remove worker starting from the admin CLI commands (we don't need to handle side-effects) * update prune cli to start scheduler but not all of the workers * fix rebase issues * remove redundant return statements * i'm sorry sir linter
Diffstat (limited to 'internal/processing/account/move_test.go')
-rw-r--r--internal/processing/account/move_test.go38
1 files changed, 16 insertions, 22 deletions
diff --git a/internal/processing/account/move_test.go b/internal/processing/account/move_test.go
index dfa0ea4e4..c1a931252 100644
--- a/internal/processing/account/move_test.go
+++ b/internal/processing/account/move_test.go
@@ -70,29 +70,23 @@ func (suite *MoveTestSuite) TestMoveAccountOK() {
suite.FailNow(err.Error())
}
- // There should be a msg heading back to fromClientAPI.
- select {
- case msg := <-suite.fromClientAPIChan:
- move, ok := msg.GTSModel.(*gtsmodel.Move)
- if !ok {
- suite.FailNow("", "could not cast %T to *gtsmodel.Move", move)
- }
-
- now := time.Now()
- suite.WithinDuration(now, move.CreatedAt, 5*time.Second)
- suite.WithinDuration(now, move.UpdatedAt, 5*time.Second)
- suite.WithinDuration(now, move.AttemptedAt, 5*time.Second)
- suite.Zero(move.SucceededAt)
- suite.NotZero(move.ID)
- suite.Equal(requestingAcct.URI, move.OriginURI)
- suite.NotNil(move.Origin)
- suite.Equal(targetAcct.URI, move.TargetURI)
- suite.NotNil(move.Target)
- suite.NotZero(move.URI)
-
- case <-time.After(5 * time.Second):
- suite.FailNow("time out waiting for message")
+ // There should be a message going to the worker.
+ cMsg, _ := suite.getClientMsg(5 * time.Second)
+ move, ok := cMsg.GTSModel.(*gtsmodel.Move)
+ if !ok {
+ suite.FailNow("", "could not cast %T to *gtsmodel.Move", move)
}
+ now := time.Now()
+ suite.WithinDuration(now, move.CreatedAt, 5*time.Second)
+ suite.WithinDuration(now, move.UpdatedAt, 5*time.Second)
+ suite.WithinDuration(now, move.AttemptedAt, 5*time.Second)
+ suite.Zero(move.SucceededAt)
+ suite.NotZero(move.ID)
+ suite.Equal(requestingAcct.URI, move.OriginURI)
+ suite.NotNil(move.Origin)
+ suite.Equal(targetAcct.URI, move.TargetURI)
+ suite.NotNil(move.Target)
+ suite.NotZero(move.URI)
// Move should be in the database now.
move, err := suite.state.DB.GetMoveByOriginTarget(