From 3658dae265f9cecc07e2a8ee73bab262d891de40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Fri, 16 May 2025 19:14:44 +0200 Subject: [PATCH] client/secret: use gotest.tools-style asserts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- client/secret_create_test.go | 8 ++------ client/secret_inspect_test.go | 8 ++------ client/secret_list_test.go | 8 ++------ client/secret_remove_test.go | 4 +--- client/secret_update_test.go | 4 +--- 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/client/secret_create_test.go b/client/secret_create_test.go index f9e5feda9b..09e20d4876 100644 --- a/client/secret_create_test.go +++ b/client/secret_create_test.go @@ -60,10 +60,6 @@ func TestSecretCreate(t *testing.T) { } r, err := client.SecretCreate(context.Background(), swarm.SecretSpec{}) - if err != nil { - t.Fatal(err) - } - if r.ID != "test_secret" { - t.Fatalf("expected `test_secret`, got %s", r.ID) - } + assert.NilError(t, err) + assert.Check(t, is.Equal(r.ID, "test_secret")) } diff --git a/client/secret_inspect_test.go b/client/secret_inspect_test.go index 67ee5175bc..ff0fbce786 100644 --- a/client/secret_inspect_test.go +++ b/client/secret_inspect_test.go @@ -83,10 +83,6 @@ func TestSecretInspect(t *testing.T) { } secretInspect, _, err := client.SecretInspectWithRaw(context.Background(), "secret_id") - if err != nil { - t.Fatal(err) - } - if secretInspect.ID != "secret_id" { - t.Fatalf("expected `secret_id`, got %s", secretInspect.ID) - } + assert.NilError(t, err) + assert.Check(t, is.Equal(secretInspect.ID, "secret_id")) } diff --git a/client/secret_list_test.go b/client/secret_list_test.go index c138f90a10..7fb88ae7ee 100644 --- a/client/secret_list_test.go +++ b/client/secret_list_test.go @@ -95,11 +95,7 @@ func TestSecretList(t *testing.T) { } secrets, err := client.SecretList(context.Background(), listCase.options) - if err != nil { - t.Fatal(err) - } - if len(secrets) != 2 { - t.Fatalf("expected 2 secrets, got %v", secrets) - } + assert.NilError(t, err) + assert.Check(t, is.Len(secrets, 2)) } } diff --git a/client/secret_remove_test.go b/client/secret_remove_test.go index 9328d9a5f6..d658baa6a0 100644 --- a/client/secret_remove_test.go +++ b/client/secret_remove_test.go @@ -61,7 +61,5 @@ func TestSecretRemove(t *testing.T) { } err := client.SecretRemove(context.Background(), "secret_id") - if err != nil { - t.Fatal(err) - } + assert.NilError(t, err) } diff --git a/client/secret_update_test.go b/client/secret_update_test.go index c41d584bdb..89c24fc937 100644 --- a/client/secret_update_test.go +++ b/client/secret_update_test.go @@ -62,7 +62,5 @@ func TestSecretUpdate(t *testing.T) { } err := client.SecretUpdate(context.Background(), "secret_id", swarm.Version{}, swarm.SecretSpec{}) - if err != nil { - t.Fatal(err) - } + assert.NilError(t, err) }