diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-30 21:03:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 21:03:32 +0100 |
| commit | 295a6f7dd086731448a1168a349f62d3035258ca (patch) | |
| tree | 30edd7597fe321c138d59f106de356f860ff14cc /test/e2e/network_test.go | |
| parent | 85101f69d8ac18dcd66e19a8a368fbcc4c5e21aa (diff) | |
| parent | 8eb0be0a29a647308b3ed9eab2126e1004b6ba85 (diff) | |
| download | podman-295a6f7dd086731448a1168a349f62d3035258ca.tar.gz podman-295a6f7dd086731448a1168a349f62d3035258ca.tar.bz2 podman-295a6f7dd086731448a1168a349f62d3035258ca.zip | |
Merge pull request #12454 from edsantiago/remove_betrue
More BeTrue cleanup
Diffstat (limited to 'test/e2e/network_test.go')
| -rw-r--r-- | test/e2e/network_test.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index 734a45bca..ff306f0f8 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -4,7 +4,6 @@ import ( "encoding/json" "fmt" "os" - "strings" "time" "github.com/containers/podman/v3/libpod/network/types" @@ -234,7 +233,7 @@ var _ = Describe("Podman network", func() { session := podmanTest.Podman(append([]string{"network", "inspect"}, expectedNetworks...)) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(session.IsJSONOutputValid()).To(BeTrue()) + Expect(session.OutputToString()).To(BeValidJSON()) }) It("podman network inspect", func() { @@ -269,7 +268,7 @@ var _ = Describe("Podman network", func() { Expect(ok).To(BeTrue()) Expect(net.NetworkID).To(Equal(netName)) Expect(net.IPPrefixLen).To(Equal(24)) - Expect(strings.HasPrefix(net.IPAddress, "10.50.50.")).To(BeTrue()) + Expect(net.IPAddress).To(HavePrefix("10.50.50.")) // Necessary to ensure the CNI network is removed cleanly rmAll := podmanTest.Podman([]string{"rm", "-t", "0", "-f", ctrName}) @@ -342,12 +341,12 @@ var _ = Describe("Podman network", func() { Expect(ok).To(BeTrue()) Expect(net1.NetworkID).To(Equal(netName1)) Expect(net1.IPPrefixLen).To(Equal(25)) - Expect(strings.HasPrefix(net1.IPAddress, "10.50.51.")).To(BeTrue()) + Expect(net1.IPAddress).To(HavePrefix("10.50.51.")) net2, ok := conData[0].NetworkSettings.Networks[netName2] Expect(ok).To(BeTrue()) Expect(net2.NetworkID).To(Equal(netName2)) Expect(net2.IPPrefixLen).To(Equal(26)) - Expect(strings.HasPrefix(net2.IPAddress, "10.50.51.")).To(BeTrue()) + Expect(net2.IPAddress).To(HavePrefix("10.50.51.")) // Necessary to ensure the CNI network is removed cleanly rmAll := podmanTest.Podman([]string{"rm", "-t", "0", "-f", ctrName}) |