From 0cc0f6f6cd188022c0127f649a03cf5249da31ea Mon Sep 17 00:00:00 2001

From: Debarshi Ray <rishi@fedoraproject.org>

Date: Mon, 5 Dec 2022 22:17:51 +0100

Subject: [PATCH 01/27] cmd/list: Remove redundant initializations

Fallout from 2369da5d31830e5cd3e1a13857a686365875ae61

https://github.com/containers/toolbox/pull/1188

(cherry picked from commit 71f73a4b31c79c14aababca67b0f172fc79948dd)

---

 src/cmd/list.go | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cmd/list.go b/src/cmd/list.go

index 948bfa68c936..158020f58287 100644

--- a/src/cmd/list.go

+++ b/src/cmd/list.go

@@ -141,7 +141,7 @@ func getContainers() ([]toolboxContainer, error) {

 	for _, container := range containers {

 		var c toolboxContainer

-		var isToolboxContainer bool = false

+		var isToolboxContainer bool

 		containerJSON, err := json.Marshal(container)

 		if err != nil {

@@ -204,7 +204,7 @@ func getImages() ([]toolboxImage, error) {

 	for _, image := range images {

 		var i toolboxImage

-		var isToolboxImage bool = false

+		var isToolboxImage bool

 		imageJSON, err := json.Marshal(image)

 		if err != nil {

-- 

2.38.1

From 7e75fc80e881c7bcdcfd7a73b7b74679cde9a922 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <rishi@fedoraproject.org>

Date: Mon, 5 Dec 2022 23:41:00 +0100

Subject: [PATCH 02/27] cmd/list: Simplify code

Fallout from 2369da5d31830e5cd3e1a13857a686365875ae61

https://github.com/containers/toolbox/pull/1189

(cherry picked from commit 67e210378e7b43cc0847cd171209861862f225b0)

---

 src/cmd/list.go | 14 ++------------

 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/cmd/list.go b/src/cmd/list.go

index 158020f58287..cb42ab1d22e3 100644

--- a/src/cmd/list.go

+++ b/src/cmd/list.go

@@ -141,7 +141,6 @@ func getContainers() ([]toolboxContainer, error) {

 	for _, container := range containers {

 		var c toolboxContainer

-		var isToolboxContainer bool

 		containerJSON, err := json.Marshal(container)

 		if err != nil {

@@ -157,14 +156,10 @@ func getContainers() ([]toolboxContainer, error) {

 		for label := range toolboxLabels {

 			if _, ok := c.Labels[label]; ok {

-				isToolboxContainer = true

+				toolboxContainers = append(toolboxContainers, c)

 				break

 			}

 		}

-

-		if isToolboxContainer {

-			toolboxContainers = append(toolboxContainers, c)

-		}

 	}

 	return toolboxContainers, nil

@@ -204,7 +199,6 @@ func getImages() ([]toolboxImage, error) {

 	for _, image := range images {

 		var i toolboxImage

-		var isToolboxImage bool

 		imageJSON, err := json.Marshal(image)

 		if err != nil {

@@ -220,14 +214,10 @@ func getImages() ([]toolboxImage, error) {

 		for label := range toolboxLabels {

 			if _, ok := i.Labels[label]; ok {

-				isToolboxImage = true

+				toolboxImages = append(toolboxImages, i)

 				break

 			}

 		}

-

-		if isToolboxImage {

-			toolboxImages = append(toolboxImages, i)

-		}

 	}

 	return toolboxImages, nil

-- 

2.38.1

From aac7c75c51d425ca9af5acd87a9ab3fa600c0481 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <rishi@fedoraproject.org>

Date: Tue, 6 Dec 2022 00:25:23 +0100

Subject: [PATCH 03/27] cmd/list, pkg/podman: Don't unmarshal the 'podman

 images' JSON twice

This builds on top of commit e7722078310a79b0.

Currently, the JSON from 'podman images --format json' gets unmarshalled

into a []map[string]interface{} in podman.GetImages, where the maps in

the slice represent images.  Each map is then marshalled back into JSON

and then again unmarshalled into a toolboxImage type.

This is wasteful.  The toolboxImage type already implements the

json.Unmarshaler interface [1], since commit e7722078310a79b0.  Hence,

the entire JSON from 'podman images --format json' can be directly

unmarshalled into a slice of toolboxImages without involving the

[]map[string]interface{}.

A subsequent commit will move the toolboxImage type into the podman

package to more tightly encapsulate the unmarshalling of the JSON.  So,

as an intermediate step in that direction, the podman.GetImages function

has been temporarily changed to return the entire JSON.

[1] https://pkg.go.dev/encoding/json#Unmarshaler

https://github.com/containers/toolbox/pull/1190

(cherry picked from commit 2486e25601331a9305ed559cb86ed807b4ea0836)

---

 src/cmd/list.go          | 26 +++++++++-----------------

 src/pkg/podman/podman.go | 16 +++++-----------

 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/cmd/list.go b/src/cmd/list.go

index cb42ab1d22e3..39fed1d5b772 100644

--- a/src/cmd/list.go

+++ b/src/cmd/list.go

@@ -189,32 +189,24 @@ func listHelp(cmd *cobra.Command, args []string) {

 func getImages() ([]toolboxImage, error) {

 	logrus.Debug("Fetching all images")

 	args := []string{"--sort", "repository"}

-	images, err := podman.GetImages(args...)

+	data, err := podman.GetImagesJSON(args...)

 	if err != nil {

 		logrus.Debugf("Fetching all images failed: %s", err)

 		return nil, errors.New("failed to get images")

 	}

+	var images []toolboxImage

+	if err := json.Unmarshal(data, &images;; err != nil {

+		logrus.Debugf("Fetching all images failed: %s", err)

+		return nil, errors.New("failed to get images")

+	}

+

 	var toolboxImages []toolboxImage

 	for _, image := range images {

-		var i toolboxImage

-

-		imageJSON, err := json.Marshal(image)

-		if err != nil {

-			logrus.Errorf("failed to marshal toolbox image: %v", err)

-			continue

-		}

-

-		err = i.UnmarshalJSON(imageJSON)

-		if err != nil {

-			logrus.Errorf("failed to unmarshal toolbox image: %v", err)

-			continue

-		}

-

 		for label := range toolboxLabels {

-			if _, ok := i.Labels[label]; ok {

-				toolboxImages = append(toolboxImages, i)

+			if _, ok := image.Labels[label]; ok {

+				toolboxImages = append(toolboxImages, image)

 				break

 			}

 		}

diff --git a/src/pkg/podman/podman.go b/src/pkg/podman/podman.go

index 9099df1eaf2a..76eb907ab20a 100644

--- a/src/pkg/podman/podman.go

+++ b/src/pkg/podman/podman.go

@@ -95,14 +95,14 @@ func GetContainers(args ...string) ([]map[string]interface{}, error) {

 	return containers, nil

 }

-// GetImages is a wrapper function around `podman images --format json` command.

+// GetImagesJSON is a wrapper function around `podman images --format json` command.

 //

 // Parameter args accepts an array of strings to be passed to the wrapped command (eg. ["-a", "--filter", "123"]).

 //

-// Returned value is a slice of dynamically unmarshalled json, so it needs to be treated properly.

+// Returned value is the JSON representing the images.

 //

 // If a problem happens during execution, first argument is nil and second argument holds the error message.

-func GetImages(args ...string) ([]map[string]interface{}, error) {

+func GetImagesJSON(args ...string) ([]byte, error) {

 	var stdout bytes.Buffer

 	logLevelString := LogLevel.String()

@@ -111,14 +111,8 @@ func GetImages(args ...string) ([]map[string]interface{}, error) {

 		return nil, err

 	}

-	output := stdout.Bytes()

-	var images []map[string]interface{}

-

-	if err := json.Unmarshal(output, &images;; err != nil {

-		return nil, err

-	}

-

-	return images, nil

+	data := stdout.Bytes()

+	return data, nil

 }

 // GetVersion returns version of Podman in a string

-- 

2.38.1

From 8aaabe469af22c9fe29cee1be653b40f019b68b7 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <rishi@fedoraproject.org>

Date: Tue, 6 Dec 2022 13:22:32 +0100

Subject: [PATCH 04/27] cmd/list: Rename a variable for ease of grepping

It's better to avoid single letter variables in general, because they

are so hard to grep for.

This will make the subsequent commit easier to read.

https://github.com/containers/toolbox/pull/1190

(cherry picked from commit e1ead145fc734fc329364b66a2db2bef15bb9721)

---

 src/cmd/list.go | 12 ++++++------

 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cmd/list.go b/src/cmd/list.go

index 39fed1d5b772..a839a47dd83c 100644

--- a/src/cmd/list.go

+++ b/src/cmd/list.go

@@ -300,7 +300,7 @@ func listOutput(images []toolboxImage, containers []toolboxContainer) {

 	}

 }

-func (i *toolboxImage) UnmarshalJSON(data []byte) error {

+func (image *toolboxImage) UnmarshalJSON(data []byte) error {

 	var raw struct {

 		ID      string

 		Names   []string

@@ -312,19 +312,19 @@ func (i *toolboxImage) UnmarshalJSON(data []byte) error {

 		return err

 	}

-	i.ID = raw.ID

-	i.Names = raw.Names

+	image.ID = raw.ID

+	image.Names = raw.Names

 	// Until Podman 2.0.x the field 'Created' held a human-readable string in

 	// format "5 minutes ago". Since Podman 2.1 the field holds an integer with

 	// Unix time. Go interprets numbers in JSON as float64.

 	switch value := raw.Created.(type) {

 	case string:

-		i.Created = value

+		image.Created = value

 	case float64:

-		i.Created = utils.HumanDuration(int64(value))

+		image.Created = utils.HumanDuration(int64(value))

 	}

-	i.Labels = raw.Labels

+	image.Labels = raw.Labels

 	return nil

 }

-- 

2.38.1

From 9378c81c4641ead00beb2aa6549b6c371e7e71f0 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <rishi@fedoraproject.org>

Date: Tue, 6 Dec 2022 13:24:19 +0100

Subject: [PATCH 05/27] cmd/list: Style fixes

This will make the subsequent commit easier to read.

https://github.com/containers/toolbox/pull/1190

(cherry picked from commit 5baf3162a9b8e6b554e4306ea79373e3a80ac7e4)

---

 src/cmd/list.go | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cmd/list.go b/src/cmd/list.go

index a839a47dd83c..fa28ca935ce8 100644

--- a/src/cmd/list.go

+++ b/src/cmd/list.go

@@ -314,6 +314,7 @@ func (image *toolboxImage) UnmarshalJSON(data []byte) error {

 	image.ID = raw.ID

 	image.Names = raw.Names

+

 	// Until Podman 2.0.x the field 'Created' held a human-readable string in

 	// format "5 minutes ago". Since Podman 2.1 the field holds an integer with

 	// Unix time. Go interprets numbers in JSON as float64.

@@ -325,7 +326,6 @@ func (image *toolboxImage) UnmarshalJSON(data []byte) error {

 	}

 	image.Labels = raw.Labels

-

 	return nil

 }

-- 

2.38.1

From ea33c5f8bd44d1f8304ee3017c15422c70f82934 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <rishi@fedoraproject.org>

Date: Tue, 6 Dec 2022 13:20:42 +0100

Subject: [PATCH 06/27] cmd/list, pkg/podman: Limit access to the raw 'podman

 images' JSON

This builds on top of commit 0465d78fd9034ce9.

The toolboxImage type has been renamed to Image and moved into the

podman package.

There is nothing Toolbx specific about the type - it represents any

image returned by 'podman images'.  The images are only later filtered

for Toolbx images.

Secondly, having the Image type inside the podman package makes it

possible to encapsulate the unmarshalling of the JSON within the package

without exposing the raw JSON to outside consumers.  This is desirable

because the unmarshalling involves tracking changes in the JSON output

by different Podman versions, and it's better to limit such details to

the podman package.

https://github.com/containers/toolbox/pull/1190

(cherry picked from commit 5f324d537ed875cacd27d711e4af37e0847ca32b)

---

 src/cmd/list.go          | 52 ++++------------------------------------

 src/pkg/podman/podman.go | 50 ++++++++++++++++++++++++++++++++++----

 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/cmd/list.go b/src/cmd/list.go

index fa28ca935ce8..9493a54593af 100644

--- a/src/cmd/list.go

+++ b/src/cmd/list.go

@@ -30,13 +30,6 @@ import (

 	"github.com/spf13/cobra"

 )

-type toolboxImage struct {

-	ID      string

-	Names   []string

-	Created string

-	Labels  map[string]string

-}

-

 type toolboxContainer struct {

 	ID      string

 	Names   []string

@@ -106,7 +99,7 @@ func list(cmd *cobra.Command, args []string) error {

 		lsImages = false

 	}

-	var images []toolboxImage

+	var images []podman.Image

 	var containers []toolboxContainer

 	var err error

@@ -186,22 +179,16 @@ func listHelp(cmd *cobra.Command, args []string) {

 	}

 }

-func getImages() ([]toolboxImage, error) {

+func getImages() ([]podman.Image, error) {

 	logrus.Debug("Fetching all images")

 	args := []string{"--sort", "repository"}

-	data, err := podman.GetImagesJSON(args...)

+	images, err := podman.GetImages(args...)

 	if err != nil {

 		logrus.Debugf("Fetching all images failed: %s", err)

 		return nil, errors.New("failed to get images")

 	}

-	var images []toolboxImage

-	if err := json.Unmarshal(data, &images;; err != nil {

-		logrus.Debugf("Fetching all images failed: %s", err)

-		return nil, errors.New("failed to get images")

-	}

-

-	var toolboxImages []toolboxImage

+	var toolboxImages []podman.Image

 	for _, image := range images {

 		for label := range toolboxLabels {

@@ -215,7 +202,7 @@ func getImages() ([]toolboxImage, error) {

 	return toolboxImages, nil

 }

-func listOutput(images []toolboxImage, containers []toolboxContainer) {

+func listOutput(images []podman.Image, containers []toolboxContainer) {

 	if len(images) != 0 {

 		writer := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)

 		fmt.Fprintf(writer, "%s\t%s\t%s\n", "IMAGE ID", "IMAGE NAME", "CREATED")

@@ -300,35 +287,6 @@ func listOutput(images []toolboxImage, containers []toolboxContainer) {

 	}

 }

-func (image *toolboxImage) UnmarshalJSON(data []byte) error {

-	var raw struct {

-		ID      string

-		Names   []string

-		Created interface{}

-		Labels  map[string]string

-	}

-

-	if err := json.Unmarshal(data, &raw;; err != nil {

-		return err

-	}

-

-	image.ID = raw.ID

-	image.Names = raw.Names

-

-	// Until Podman 2.0.x the field 'Created' held a human-readable string in

-	// format "5 minutes ago". Since Podman 2.1 the field holds an integer with

-	// Unix time. Go interprets numbers in JSON as float64.

-	switch value := raw.Created.(type) {

-	case string:

-		image.Created = value

-	case float64:

-		image.Created = utils.HumanDuration(int64(value))

-	}

-

-	image.Labels = raw.Labels

-	return nil

-}

-

 func (c *toolboxContainer) UnmarshalJSON(data []byte) error {

 	var raw struct {

 		ID      string

diff --git a/src/pkg/podman/podman.go b/src/pkg/podman/podman.go

index 76eb907ab20a..623116707f36 100644

--- a/src/pkg/podman/podman.go

+++ b/src/pkg/podman/podman.go

@@ -24,9 +24,17 @@ import (

 	"github.com/HarryMichal/go-version"

 	"github.com/containers/toolbox/pkg/shell"

+	"github.com/containers/toolbox/pkg/utils"

 	"github.com/sirupsen/logrus"

 )

+type Image struct {

+	ID      string

+	Names   []string

+	Created string

+	Labels  map[string]string

+}

+

 var (

 	podmanVersion string

 )

@@ -35,6 +43,35 @@ var (

 	LogLevel = logrus.ErrorLevel

 )

+func (image *Image) UnmarshalJSON(data []byte) error {

+	var raw struct {

+		ID      string

+		Names   []string

+		Created interface{}

+		Labels  map[string]string

+	}

+

+	if err := json.Unmarshal(data, &raw;; err != nil {

+		return err

+	}

+

+	image.ID = raw.ID

+	image.Names = raw.Names

+

+	// Until Podman 2.0.x the field 'Created' held a human-readable string in

+	// format "5 minutes ago". Since Podman 2.1 the field holds an integer with

+	// Unix time. Go interprets numbers in JSON as float64.

+	switch value := raw.Created.(type) {

+	case string:

+		image.Created = value

+	case float64:

+		image.Created = utils.HumanDuration(int64(value))

+	}

+

+	image.Labels = raw.Labels

+	return nil

+}

+

 // CheckVersion compares provided version with the version of Podman.

 //

 // Takes in one string parameter that should be in the format that is used for versioning (eg. 1.0.0, 2.5.1-dev).

@@ -95,14 +132,14 @@ func GetContainers(args ...string) ([]map[string]interface{}, error) {

 	return containers, nil

 }

-// GetImagesJSON is a wrapper function around `podman images --format json` command.

+// GetImages is a wrapper function around `podman images --format json` command.

 //

 // Parameter args accepts an array of strings to be passed to the wrapped command (eg. ["-a", "--filter", "123"]).

 //

-// Returned value is the JSON representing the images.

+// Returned value is a slice of Images.

 //

 // If a problem happens during execution, first argument is nil and second argument holds the error message.

-func GetImagesJSON(args ...string) ([]byte, error) {

+func GetImages(args ...string) ([]Image, error) {

 	var stdout bytes.Buffer

 	logLevelString := LogLevel.String()

@@ -112,7 +149,12 @@ func GetImagesJSON(args ...string) ([]byte, error) {

 	}

 	data := stdout.Bytes()

-	return data, nil

+	var images []Image

+	if err := json.Unmarshal(data, &images;; err != nil {

+		return nil, err

+	}

+

+	return images, nil

 }

 // GetVersion returns version of Podman in a string

-- 

2.38.1

From 5a2de56ad4d3222eef60cd30b09e18d81e042693 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <rishi@fedoraproject.org>

Date: Thu, 8 Dec 2022 00:22:38 +0100

Subject: [PATCH 07/27] test/system: Remove stray (possibly for debugging)

 'podman images'

This was making it difficult to read the Bats assertions on test

failures, by polluting it with unexpected and irrelevant output from

'podman images'.  For example [1]:

  not ok 39 list: Images with and without names in 12332ms

  # (from function `assert' in file test/system/libs/bats-assert/src/assert.bash, line 46,

  #  in test file test/system/102-list.bats, line 126)

  #   `assert [ ${#stderr_lines[@]} -eq 0 ]' failed

  # REPOSITORY                                 TAG         IMAGE ID      CREATED      SIZE

  # registry.fedoraproject.org/fedora-toolbox  35          862705390e8b  4 weeks ago  332 MB

  # REPOSITORY                                 TAG         IMAGE ID      CREATED       SIZE

  # registry.fedoraproject.org/fedora-toolbox  35          862705390e8b  4 weeks ago   332 MB

  # registry.fedoraproject.org/fedora-toolbox  34          70cbe2ce60ca  7 months ago  354 MB

  #

  # -- assertion failed --

  # expression : [ 1 -eq 0 ]

  # --

  #

Fallout from 7973181136494a4ba147808c9ad51ace9aa4305f

[1] https://github.com/containers/toolbox/pull/1192

https://github.com/containers/toolbox/pull/1193

(cherry picked from commit 7375be82d094204055ff056eba7820eef3f8247f)

---

 test/system/libs/helpers.bash | 2 --

 1 file changed, 2 deletions(-)

diff --git a/test/system/libs/helpers.bash b/test/system/libs/helpers.bash

index d728c0fc5f20..4e396e60f4bf 100644

--- a/test/system/libs/helpers.bash

+++ b/test/system/libs/helpers.bash

@@ -162,8 +162,6 @@ function pull_distro_image() {

     echo "Failed to load image ${image} from cache ${IMAGE_CACHE_DIR}/${image_archive}"

     assert_success

   fi

-

-  $PODMAN images

 }

-- 

2.38.1

From 57b04bb56b6ddf821fa9b82c6ee21de9c4d60779 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <rishi@fedoraproject.org>

Date: Wed, 7 Dec 2022 13:34:38 +0100

Subject: [PATCH 08/27] test/system: Test the order in 'list' for images and

 containers

https://github.com/containers/toolbox/pull/1192

(backported from commit da1724c8968c7169d3cfb7dc1730af27b6abab7d)

---

 test/system/102-list.bats | 20 ++++++++++----------

 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/system/102-list.bats b/test/system/102-list.bats

index 1989409b1207..3f99c041f8cc 100644

--- a/test/system/102-list.bats

+++ b/test/system/102-list.bats

@@ -62,26 +62,26 @@ teardown() {

   run $TOOLBOX list --images

   assert_success

-  assert_output --partial "$(get_system_id)-toolbox:$(get_system_version)"

-  assert_output --partial "fedora-toolbox:32"

+  assert_line --index 1 --partial "$(get_system_id)-toolbox:$(get_system_version)"

+  assert_line --index 2 --partial "fedora-toolbox:32"

   # Check containers

   run $TOOLBOX list --containers

   assert_success

-  assert_output --partial "$(get_system_id)-toolbox-$(get_system_version)"

-  assert_output --partial "non-default-one"

-  assert_output --partial "non-default-two"

+  assert_line --index 1 --partial "$(get_system_id)-toolbox-$(get_system_version)"

+  assert_line --index 2 --partial "non-default-one"

+  assert_line --index 3 --partial "non-default-two"

   # Check all together

   run $TOOLBOX list

   assert_success

-  assert_output --partial "$(get_system_id)-toolbox:$(get_system_version)"

-  assert_output --partial "fedora-toolbox:32"

-  assert_output --partial "$(get_system_id)-toolbox-$(get_system_version)"

-  assert_output --partial "non-default-one"

-  assert_output --partial "non-default-two"

+  assert_line --index 1 --partial "$(get_system_id)-toolbox:$(get_system_version)"

+  assert_line --index 2 --partial "fedora-toolbox:32"

+  assert_line --index 4 --partial "$(get_system_id)-toolbox-$(get_system_version)"

+  assert_line --index 5 --partial "non-default-one"

+  assert_line --index 6 --partial "non-default-two"

 }

 @test "list: List an image without a name" {

-- 

2.38.1

From be0e67b673f1ff399289e4f4c0837637979b12d8 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <rishi@fedoraproject.org>

Date: Wed, 7 Dec 2022 15:22:04 +0100

Subject: [PATCH 09/27] test/system: Keep empty lines to prevent missing and

 spurious newlines

The tests are intended for Toolbx, not Podman or other commands.  Hence,

it's only necessary to keep the empty lines for Toolbx invocations.

Being too sensitive about the exact output of other commands can lead to

spurious failures [1].

[1] Commit 259afdf815e718b7

    https://github.com/containers/toolbox/pull/846

https://github.com/containers/toolbox/pull/1192

(backported from commit 0fde202d82a781849169dab8cfb5d2aa0184d970)

---

 test/system/102-list.bats | 22 +++++++++++-----------

 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/system/102-list.bats b/test/system/102-list.bats

index 3f99c041f8cc..620626739411 100644

--- a/test/system/102-list.bats

+++ b/test/system/102-list.bats

@@ -15,21 +15,21 @@ teardown() {

 @test "list: Run 'list' with zero containers and zero images (the list should be empty)" {

-  run $TOOLBOX list

+  run --keep-empty-lines $TOOLBOX list

   assert_success

   assert_output ""

 }

 @test "list: Run 'list -c' with zero containers (the list should be empty)" {

-  run $TOOLBOX list -c

+  run --keep-empty-lines $TOOLBOX list -c

   assert_success

   assert_output ""

 }

 @test "list: Run 'list -i' with zero images (the list should be empty)" {

-  run $TOOLBOX list -i

+  run --keep-empty-lines $TOOLBOX list -i

   assert_success

   assert_output ""

@@ -42,7 +42,7 @@ teardown() {

   assert_output --partial "$BUSYBOX_IMAGE"

-  run $TOOLBOX list

+  run --keep-empty-lines $TOOLBOX list

   assert_success

   assert_output ""

@@ -59,14 +59,14 @@ teardown() {

   create_container non-default-two

   # Check images

-  run $TOOLBOX list --images

+  run --keep-empty-lines $TOOLBOX list --images