From 44f30261dac977f9ff10948c57eb9a7bf6b8c90d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
Date: Fri, 16 May 2025 19:14:42 +0200
Subject: [PATCH] client/plugin: 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 <pawel.gronowski@docker.com>
---
 client/plugin_disable_test.go | 4 +---
 client/plugin_enable_test.go  | 4 +---
 client/plugin_inspect_test.go | 8 ++------
 client/plugin_list_test.go    | 8 ++------
 client/plugin_push_test.go    | 4 +---
 client/plugin_remove_test.go  | 4 +---
 client/plugin_set_test.go     | 4 +---
 7 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/client/plugin_disable_test.go b/client/plugin_disable_test.go
index 45ec3a8ffb..a061fd7679 100644
--- a/client/plugin_disable_test.go
+++ b/client/plugin_disable_test.go
@@ -51,7 +51,5 @@ func TestPluginDisable(t *testing.T) {
 	}
 
 	err := client.PluginDisable(context.Background(), "plugin_name", types.PluginDisableOptions{})
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NilError(t, err)
 }
diff --git a/client/plugin_enable_test.go b/client/plugin_enable_test.go
index ba01c61f4e..c1f82b478a 100644
--- a/client/plugin_enable_test.go
+++ b/client/plugin_enable_test.go
@@ -51,7 +51,5 @@ func TestPluginEnable(t *testing.T) {
 	}
 
 	err := client.PluginEnable(context.Background(), "plugin_name", types.PluginEnableOptions{})
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NilError(t, err)
 }
diff --git a/client/plugin_inspect_test.go b/client/plugin_inspect_test.go
index 02474ca66e..8e5f1b7fec 100644
--- a/client/plugin_inspect_test.go
+++ b/client/plugin_inspect_test.go
@@ -62,10 +62,6 @@ func TestPluginInspect(t *testing.T) {
 	}
 
 	pluginInspect, _, err := client.PluginInspectWithRaw(context.Background(), "plugin_name")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if pluginInspect.ID != "plugin_id" {
-		t.Fatalf("expected `plugin_id`, got %s", pluginInspect.ID)
-	}
+	assert.NilError(t, err)
+	assert.Check(t, is.Equal(pluginInspect.ID, "plugin_id"))
 }
diff --git a/client/plugin_list_test.go b/client/plugin_list_test.go
index 684b7d3e5f..eb21a6dc4f 100644
--- a/client/plugin_list_test.go
+++ b/client/plugin_list_test.go
@@ -94,11 +94,7 @@ func TestPluginList(t *testing.T) {
 		}
 
 		plugins, err := client.PluginList(context.Background(), listCase.filters)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(plugins) != 2 {
-			t.Fatalf("expected 2 plugins, got %v", plugins)
-		}
+		assert.NilError(t, err)
+		assert.Check(t, is.Len(plugins, 2))
 	}
 }
diff --git a/client/plugin_push_test.go b/client/plugin_push_test.go
index 2e593f5524..b9d116f298 100644
--- a/client/plugin_push_test.go
+++ b/client/plugin_push_test.go
@@ -55,7 +55,5 @@ func TestPluginPush(t *testing.T) {
 	}
 
 	_, err := client.PluginPush(context.Background(), "plugin_name", "authtoken")
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NilError(t, err)
 }
diff --git a/client/plugin_remove_test.go b/client/plugin_remove_test.go
index 48ac649198..99c4758f10 100644
--- a/client/plugin_remove_test.go
+++ b/client/plugin_remove_test.go
@@ -51,7 +51,5 @@ func TestPluginRemove(t *testing.T) {
 	}
 
 	err := client.PluginRemove(context.Background(), "plugin_name", types.PluginRemoveOptions{})
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NilError(t, err)
 }
diff --git a/client/plugin_set_test.go b/client/plugin_set_test.go
index 4a62db8152..5fe23c32e4 100644
--- a/client/plugin_set_test.go
+++ b/client/plugin_set_test.go
@@ -50,7 +50,5 @@ func TestPluginSet(t *testing.T) {
 	}
 
 	err := client.PluginSet(context.Background(), "plugin_name", []string{"arg1"})
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NilError(t, err)
 }