Fix bad rebase

Apparently I can't git...

command/format.go

@@ -250,6 +250,6 @@ func OutputSealStatus(ui cli.Ui, client *api.Client, status *api.SealStatusRespo
 		}
 	}
 
-	ui.Output(columnOutput(out, nil))
+	ui.Output(tableOutput(out, nil))
 	return 0
 }

command/operator_unseal_test.go

@@ -1,7 +1,6 @@
 package command
 
 import (
-	"fmt"
 	"io/ioutil"
 	"strings"
 	"testing"
@@ -68,7 +67,7 @@ func TestOperatorUnsealCommand_Run(t *testing.T) {
 		if exp := 0; code != exp {
 			t.Errorf("expected %d to be %d", code, exp)
 		}
-		expected := "Unseal Progress: 0"
+		expected := "0/3"
 		combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
 		if !strings.Contains(combined, expected) {
 			t.Errorf("expected %q to contain %q", combined, expected)
@@ -86,7 +85,7 @@ func TestOperatorUnsealCommand_Run(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		for i, key := range keys {
+		for _, key := range keys {
 			ui, cmd := testOperatorUnsealCommand(t)
 			cmd.client = client
 			cmd.testOutput = ioutil.Discard
@@ -96,14 +95,17 @@ func TestOperatorUnsealCommand_Run(t *testing.T) {
 				key,
 			})
 			if exp := 0; code != exp {
-				t.Errorf("expected %d to be %d", code, exp)
-			}
-			expected := fmt.Sprintf("Unseal Progress: %d", (i+1)%3) // 1, 2, 0
-			combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
-			if !strings.Contains(combined, expected) {
-				t.Errorf("expected %q to contain %q", combined, expected)
+				t.Errorf("expected %d to be %d: %s", code, exp, ui.ErrorWriter.String())
 			}
 		}
+
+		status, err := client.Sys().SealStatus()
+		if err != nil {
+			t.Fatal(err)
+		}
+		if status.Sealed {
+			t.Error("expected unsealed")
+		}
 	})
 
 	t.Run("communication_failure", func(t *testing.T) {

command/path_help_test.go

@@ -46,9 +46,9 @@ func TestPathHelpCommand_Run(t *testing.T) {
 			2,
 		},
 		{
-			"generic",
+			"kv",
 			[]string{"secret/"},
-			"The generic backend",
+			"The kv backend",
 			0,
 		},
 		{