From 32080e62023fa187998b96740af31cc6bbed29bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Thu, 3 Mar 2022 12:13:50 +0100 Subject: [PATCH] jobqueuetest: modify testArgs to test also channels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit jobqueue.Job must return the channel specified in jobqueue.Enqueue during the whole lifecycle of the given job. Signed-off-by: Ondล™ej Budai --- .../jobqueue/jobqueuetest/jobqueuetest.go | 40 ++++++++++++++----- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/internal/jobqueue/jobqueuetest/jobqueuetest.go b/internal/jobqueue/jobqueuetest/jobqueuetest.go index fc3dc002a..92488f09b 100644 --- a/internal/jobqueue/jobqueuetest/jobqueuetest.go +++ b/internal/jobqueue/jobqueuetest/jobqueuetest.go @@ -103,14 +103,34 @@ func testArgs(t *testing.T, q jobqueue.JobQueue) { } oneargs := argument{7, "๐Ÿ "} - one := pushTestJob(t, q, "fish", oneargs, nil, "") - - twoargs := argument{42, "๐Ÿ™"} - two := pushTestJob(t, q, "octopus", twoargs, nil, "") - var parsedArgs argument - id, tok, deps, typ, args, err := q.Dequeue(context.Background(), []string{"octopus"}, []string{""}) + one := pushTestJob(t, q, "fish", oneargs, nil, "toucan") + + // Read job params before Dequeue + jtype, jargs, jdeps, jchan, err := q.Job(one) + require.NoError(t, err) + err = json.Unmarshal(jargs, &parsedArgs) + require.NoError(t, err) + require.Equal(t, oneargs, parsedArgs) + require.Empty(t, jdeps) + require.Equal(t, "toucan", jchan) + require.Equal(t, "fish", jtype) + + twoargs := argument{42, "๐Ÿ™"} + two := pushTestJob(t, q, "octopus", twoargs, nil, "kingfisher") + + // Read job params before Dequeue + jtype, jargs, jdeps, jchan, err = q.Job(two) + require.NoError(t, err) + err = json.Unmarshal(jargs, &parsedArgs) + require.NoError(t, err) + require.Equal(t, twoargs, parsedArgs) + require.Empty(t, jdeps) + require.Equal(t, "kingfisher", jchan) + require.Equal(t, "octopus", jtype) + + id, tok, deps, typ, args, err := q.Dequeue(context.Background(), []string{"octopus"}, []string{"kingfisher"}) require.NoError(t, err) require.Equal(t, two, id) require.NotEmpty(t, tok) @@ -121,13 +141,14 @@ func testArgs(t *testing.T, q jobqueue.JobQueue) { require.Equal(t, twoargs, parsedArgs) // Read job params after Dequeue - jtype, jargs, jdeps, _, err := q.Job(id) + jtype, jargs, jdeps, jchan, err = q.Job(id) require.NoError(t, err) require.Equal(t, args, jargs) require.Equal(t, deps, jdeps) + require.Equal(t, "kingfisher", jchan) require.Equal(t, typ, jtype) - id, tok, deps, typ, args, err = q.Dequeue(context.Background(), []string{"fish"}, []string{""}) + id, tok, deps, typ, args, err = q.Dequeue(context.Background(), []string{"fish"}, []string{"toucan"}) require.NoError(t, err) require.Equal(t, one, id) require.NotEmpty(t, tok) @@ -137,10 +158,11 @@ func testArgs(t *testing.T, q jobqueue.JobQueue) { require.NoError(t, err) require.Equal(t, oneargs, parsedArgs) - jtype, jargs, jdeps, _, err = q.Job(id) + jtype, jargs, jdeps, jchan, err = q.Job(id) require.NoError(t, err) require.Equal(t, args, jargs) require.Equal(t, deps, jdeps) + require.Equal(t, "toucan", jchan) require.Equal(t, typ, jtype) _, _, _, _, err = q.Job(uuid.New())