Always hide identical arch column any width

Signed-off-by: Anders F Björklund <[email protected]>

Author: afbjorklund

pkg/store/instance.go

@@ -270,9 +270,7 @@ func PrintInstances(w io.Writer, instances []*Instance, format string, options *
 		if !hideType {
 			columns++ // VMTYPE
 		}
-		if width != 0 && (columns+6)*8 > width && !all {
-			hideArch = len(archs) == 1
-		}
+		hideArch = len(archs) == 1 && !all
 		if !hideArch {
 			columns++ // ARCH
 		}

pkg/store/instance_test.go

@@ -18,8 +18,8 @@ var instance = Instance{
 	Dir:    "dir",
 }
 
-var table = "NAME    STATUS     SSH            VMTYPE    ARCH      CPUS    MEMORY    DISK    DIR\n" +
-	"foo     Stopped    127.0.0.1:0    qemu      x86_64    0       0B        0B      dir\n"
+var table = "NAME    STATUS     SSH            VMTYPE    CPUS    MEMORY    DISK    DIR\n" +
+	"foo     Stopped    127.0.0.1:0    qemu      0       0B        0B      dir\n"
 
 // for width 60, everything is hidden
 var table60 = "NAME    STATUS     SSH            CPUS    MEMORY    DISK\n" +
@@ -29,15 +29,19 @@ var table60 = "NAME    STATUS     SSH            CPUS    MEMORY    DISK\n" +
 var table80 = "NAME    STATUS     SSH            CPUS    MEMORY    DISK    DIR\n" +
 	"foo     Stopped    127.0.0.1:0    0       0B        0B      dir\n"
 
+// for width 100 (or with all), nothing is hidden
+var tableAll = "NAME    STATUS     SSH            VMTYPE    ARCH      CPUS    MEMORY    DISK    DIR\n" +
+	"foo     Stopped    127.0.0.1:0    qemu      x86_64    0       0B        0B      dir\n"
+
 // for width 80, directory is hidden (if not identical)
 var tableTwo = "NAME    STATUS     SSH            VMTYPE    ARCH       CPUS    MEMORY    DISK\n" +
 	"foo     Stopped    127.0.0.1:0    qemu      x86_64     0       0B        0B\n" +
 	"bar     Stopped    127.0.0.1:0    vz        aarch64    0       0B        0B\n"
 
 const separator = string(filepath.Separator)
 
-var tableHome = "NAME    STATUS     SSH            VMTYPE    ARCH      CPUS    MEMORY    DISK    DIR\n" +
-	"foo     Stopped    127.0.0.1:0    qemu      x86_64    0       0B        0B      ~" + separator + "dir\n"
+var tableHome = "NAME    STATUS     SSH            VMTYPE    CPUS    MEMORY    DISK    DIR\n" +
+	"foo     Stopped    127.0.0.1:0    qemu      0       0B        0B      ~" + separator + "dir\n"
 
 func TestPrintInstanceTable(t *testing.T) {
 	var buf bytes.Buffer
@@ -75,7 +79,7 @@ func TestPrintInstanceTableAll(t *testing.T) {
 	instances := []*Instance{&instance}
 	options := PrintOptions{TerminalWidth: 40, AllFields: true}
 	PrintInstances(&buf, instances, "table", &options)
-	assert.Equal(t, buf.String(), table)
+	assert.Equal(t, buf.String(), tableAll)
 }
 
 func TestPrintInstanceTableTwo(t *testing.T) {