diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-03 09:10:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-03 09:10:53 -0400 |
| commit | de5eb3831190262169eab36e64c41992dc22766a (patch) | |
| tree | 66594f108877fa59012ba371fb19474bb6aa6d4e /test/e2e | |
| parent | 41358f5ea06062f1e1b80bd29802ea5d51cfe3b1 (diff) | |
| parent | fef3e2da6a2024fff5142b5df80aba36e895ed73 (diff) | |
| download | podman-de5eb3831190262169eab36e64c41992dc22766a.tar.gz podman-de5eb3831190262169eab36e64c41992dc22766a.tar.bz2 podman-de5eb3831190262169eab36e64c41992dc22766a.zip | |
Merge pull request #7191 from openSUSE/printf
Remove some unnecessary []byte to string conversions
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/run_volume_test.go | 6 | ||||
| -rw-r--r-- | test/e2e/search_test.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go index c729423a3..c4ee05af9 100644 --- a/test/e2e/run_volume_test.go +++ b/test/e2e/run_volume_test.go @@ -241,7 +241,7 @@ var _ = Describe("Podman run with volumes", func() { Expect(mountCmd1.ExitCode()).To(Equal(0)) os.Stdout.Sync() os.Stderr.Sync() - mountOut1 := strings.Join(strings.Fields(fmt.Sprintf("%s", mountCmd1.Out.Contents())), " ") + mountOut1 := strings.Join(strings.Fields(string(mountCmd1.Out.Contents())), " ") fmt.Printf("Output: %s", mountOut1) Expect(strings.Contains(mountOut1, volName)).To(BeFalse()) @@ -257,7 +257,7 @@ var _ = Describe("Podman run with volumes", func() { Expect(mountCmd2.ExitCode()).To(Equal(0)) os.Stdout.Sync() os.Stderr.Sync() - mountOut2 := strings.Join(strings.Fields(fmt.Sprintf("%s", mountCmd2.Out.Contents())), " ") + mountOut2 := strings.Join(strings.Fields(string(mountCmd2.Out.Contents())), " ") fmt.Printf("Output: %s", mountOut2) Expect(strings.Contains(mountOut2, volName)).To(BeTrue()) @@ -278,7 +278,7 @@ var _ = Describe("Podman run with volumes", func() { Expect(mountCmd3.ExitCode()).To(Equal(0)) os.Stdout.Sync() os.Stderr.Sync() - mountOut3 := strings.Join(strings.Fields(fmt.Sprintf("%s", mountCmd3.Out.Contents())), " ") + mountOut3 := strings.Join(strings.Fields(string(mountCmd3.Out.Contents())), " ") fmt.Printf("Output: %s", mountOut3) Expect(strings.Contains(mountOut3, volName)).To(BeFalse()) }) diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go index 104bb4ec8..c6766fe2a 100644 --- a/test/e2e/search_test.go +++ b/test/e2e/search_test.go @@ -103,7 +103,7 @@ registries = ['{{.Host}}:{{.Port}}']` search := podmanTest.Podman([]string{"search", "quay.io/libpod/whalesay"}) search.WaitWithDefaultTimeout() Expect(search.ExitCode()).To(Equal(0)) - output := fmt.Sprintf("%s", search.Out.Contents()) + output := string(search.Out.Contents()) match, _ := regexp.MatchString(`(?m)^quay.io\s+quay.io/libpod/whalesay\s+Static image used for automated testing.+$`, output) Expect(match).To(BeTrue()) }) |