From 31b81982860c5edbb4c9ded68f66d8e2472ed3a2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 1 Feb 2025 14:19:04 +0100 Subject: [PATCH] cli/command/volume: TestVolumeCreateClusterOpts: minor fixes and refactor - assert unhandled error - discard stdout/stderr output Signed-off-by: Sebastiaan van Stijn --- cli/command/volume/create_test.go | 34 ++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/cli/command/volume/create_test.go b/cli/command/volume/create_test.go index e1c5c18eaf..9984f835cb 100644 --- a/cli/command/volume/create_test.go +++ b/cli/command/volume/create_test.go @@ -233,25 +233,27 @@ func TestVolumeCreateClusterOpts(t *testing.T) { }) cmd := newCreateCommand(cli) + cmd.SetOut(io.Discard) + cmd.SetErr(io.Discard) cmd.SetArgs([]string{"name"}) - cmd.Flags().Set("driver", "csi") - cmd.Flags().Set("group", "gronp") - cmd.Flags().Set("scope", "multi") - cmd.Flags().Set("sharing", "onewriter") - cmd.Flags().Set("type", "mount") - cmd.Flags().Set("sharing", "onewriter") - cmd.Flags().Set("required-bytes", "1234") - cmd.Flags().Set("limit-bytes", "567890") + assert.Check(t, cmd.Flags().Set("driver", "csi")) + assert.Check(t, cmd.Flags().Set("group", "gronp")) + assert.Check(t, cmd.Flags().Set("scope", "multi")) + assert.Check(t, cmd.Flags().Set("sharing", "onewriter")) + assert.Check(t, cmd.Flags().Set("type", "mount")) + assert.Check(t, cmd.Flags().Set("sharing", "onewriter")) + assert.Check(t, cmd.Flags().Set("required-bytes", "1234")) + assert.Check(t, cmd.Flags().Set("limit-bytes", "567890")) - cmd.Flags().Set("secret", "key1=secret1") - cmd.Flags().Set("secret", "key2=secret2") + assert.Check(t, cmd.Flags().Set("secret", "key1=secret1")) + assert.Check(t, cmd.Flags().Set("secret", "key2=secret2")) - cmd.Flags().Set("topology-required", "region=R1,zone=Z1") - cmd.Flags().Set("topology-required", "region=R1,zone=Z2") - cmd.Flags().Set("topology-required", "region=R1,zone=Z3") + assert.Check(t, cmd.Flags().Set("topology-required", "region=R1,zone=Z1")) + assert.Check(t, cmd.Flags().Set("topology-required", "region=R1,zone=Z2")) + assert.Check(t, cmd.Flags().Set("topology-required", "region=R1,zone=Z3")) - cmd.Flags().Set("topology-preferred", "region=R1,zone=Z2") - cmd.Flags().Set("topology-preferred", "region=R1,zone=Z3") + assert.Check(t, cmd.Flags().Set("topology-preferred", "region=R1,zone=Z2")) + assert.Check(t, cmd.Flags().Set("topology-preferred", "region=R1,zone=Z3")) - cmd.Execute() + assert.NilError(t, cmd.Execute()) }