From 89b4f78f51cc002527f5cd5557fa800a02562333 Mon Sep 17 00:00:00 2001 From: Lawrence Wong Date: Thu, 12 Jan 2023 14:31:52 -0800 Subject: [PATCH] Add sanity check for result in TestRealisClient_CreateService --- realis.go | 2 +- realis_e2e_test.go | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/realis.go b/realis.go index 3552f61..1494d52 100644 --- a/realis.go +++ b/realis.go @@ -602,7 +602,7 @@ func (c *Client) StartJobUpdate(updateJob *JobUpdate, message string) (*aurora.S resp, retryErr := c.thriftCallWithRetries(false, func() (*aurora.Response, error) { - return c.client.StartJobUpdate(context.TODO(), updateJob.request, message) + return c.client.StartJobUpdate(nil, updateJob.request, message) }, func() (*aurora.Response, bool) { key := updateJob.JobKey() diff --git a/realis_e2e_test.go b/realis_e2e_test.go index 1f544d8..04fb307 100644 --- a/realis_e2e_test.go +++ b/realis_e2e_test.go @@ -477,13 +477,15 @@ func TestRealisClient_CreateService(t *testing.T) { var ok bool var mErr error - if ok, mErr = r.MonitorJobUpdate(*result.GetKey(), 5*time.Second, 4*time.Minute); !ok || mErr != nil { - // Update may already be in a terminal state so don't check for error - err := r.AbortJobUpdate(*result.GetKey(), "Monitor timed out.") + if result != nil { + if ok, mErr = r.MonitorJobUpdate(*result.GetKey(), 5*time.Second, 4*time.Minute); !ok || mErr != nil { + // Update may already be in a terminal state so don't check for error + err := r.AbortJobUpdate(*result.GetKey(), "Monitor timed out.") - err = r.KillJob(job.JobKey()) + err = r.KillJob(job.JobKey()) - assert.NoError(t, err) + assert.NoError(t, err) + } } assert.True(t, ok)