From 9c8764e02a45fa1e046583b6bdb6e09e95f21580 Mon Sep 17 00:00:00 2001 From: Roey Berman Date: Fri, 13 Sep 2024 06:31:53 -0700 Subject: [PATCH 1/2] fix typo in OperationCompletionSuccessfulOptions --- nexus/completion.go | 6 +++--- nexus/completion_test.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nexus/completion.go b/nexus/completion.go index 0dc5080..cf472ee 100644 --- a/nexus/completion.go +++ b/nexus/completion.go @@ -39,15 +39,15 @@ type OperationCompletionSuccessful struct { Body io.Reader } -// OperationCompletionSuccesfulOptions are options for [NewOperationCompletionSuccessful]. -type OperationCompletionSuccesfulOptions struct { +// OperationCompletionSuccessfulOptions are options for [NewOperationCompletionSuccessful]. +type OperationCompletionSuccessfulOptions struct { // Optional serializer for the result. Defaults to the SDK's default Serializer, which handles JSONables, byte // slices and nils. Serializer Serializer } // NewOperationCompletionSuccessful constructs an [OperationCompletionSuccessful] from a given result. -func NewOperationCompletionSuccessful(result any, options OperationCompletionSuccesfulOptions) (*OperationCompletionSuccessful, error) { +func NewOperationCompletionSuccessful(result any, options OperationCompletionSuccessfulOptions) (*OperationCompletionSuccessful, error) { if reader, ok := result.(*Reader); ok { return &OperationCompletionSuccessful{ Header: addContentHeaderToHTTPHeader(reader.Header, make(http.Header)), diff --git a/nexus/completion_test.go b/nexus/completion_test.go index 110434c..846f293 100644 --- a/nexus/completion_test.go +++ b/nexus/completion_test.go @@ -41,7 +41,7 @@ func TestSuccessfulCompletion(t *testing.T) { ctx, callbackURL, teardown := setupForCompletion(t, &successfulCompletionHandler{}, nil) defer teardown() - completion, err := NewOperationCompletionSuccessful(666, OperationCompletionSuccesfulOptions{}) + completion, err := NewOperationCompletionSuccessful(666, OperationCompletionSuccessfulOptions{}) completion.Header.Add("foo", "bar") require.NoError(t, err) @@ -60,7 +60,7 @@ func TestSuccessfulCompletion_CustomSerializr(t *testing.T) { ctx, callbackURL, teardown := setupForCompletion(t, &successfulCompletionHandler{}, serializer) defer teardown() - completion, err := NewOperationCompletionSuccessful(666, OperationCompletionSuccesfulOptions{ + completion, err := NewOperationCompletionSuccessful(666, OperationCompletionSuccessfulOptions{ Serializer: serializer, }) completion.Header.Add("foo", "bar") From 7b5149f706c51fed49dadcc48bbbfa05e560e19d Mon Sep 17 00:00:00 2001 From: Roey Berman Date: Fri, 13 Sep 2024 09:34:02 -0700 Subject: [PATCH 2/2] Fix test flake --- nexus/get_result_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nexus/get_result_test.go b/nexus/get_result_test.go index 1e0a786..da05b17 100644 --- a/nexus/get_result_test.go +++ b/nexus/get_result_test.go @@ -133,7 +133,9 @@ func TestWaitResult_DeadlineExceeded(t *testing.T) { deadline, _ := ctx.Deadline() _, err = handle.GetResult(ctx, GetOperationResultOptions{Wait: time.Second}) require.ErrorIs(t, err, context.DeadlineExceeded) - require.WithinDuration(t, deadline, handler.requests[0].deadline, 1*time.Millisecond) + // Allow up to 10 ms delay to account for slow CI. + // This test is inherently flaky, and should be rewritten. + require.WithinDuration(t, deadline, handler.requests[0].deadline, 10*time.Millisecond) } func TestWaitResult_RequestTimeout(t *testing.T) {