diff options
| author | Kir Kolyshkin <kolyshkin@gmail.com> | 2022-09-13 15:13:09 -0700 |
|---|---|---|
| committer | Kir Kolyshkin <kolyshkin@gmail.com> | 2022-09-13 16:26:26 -0700 |
| commit | 75740be39541296d379e34902e11ba49e96a1867 (patch) | |
| tree | 9b4a5a807803d399787d0466221f25dab6240064 /test/e2e/run_networking_test.go | |
| parent | c64388728f5efec2658cf9097dbe15126f30753e (diff) | |
| download | podman-75740be39541296d379e34902e11ba49e96a1867.tar.gz podman-75740be39541296d379e34902e11ba49e96a1867.tar.bz2 podman-75740be39541296d379e34902e11ba49e96a1867.zip | |
all: stop using deprecated GenerateNonCryptoID
In view of https://github.com/containers/storage/pull/1337, do this:
for f in $(git grep -l stringid.GenerateNonCryptoID | grep -v '^vendor/'); do
sed -i 's/stringid.GenerateNonCryptoID/stringid.GenerateRandomID/g' $f;
done
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Diffstat (limited to 'test/e2e/run_networking_test.go')
| -rw-r--r-- | test/e2e/run_networking_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index 1ad78c950..78e4a62c0 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -869,7 +869,7 @@ EXPOSE 2004-2005/tcp`, ALPINE) }) It("podman run in custom CNI network with --static-ip", func() { - netName := stringid.GenerateNonCryptoID() + netName := stringid.GenerateRandomID() ipAddr := "10.25.30.128" create := podmanTest.Podman([]string{"network", "create", "--subnet", "10.25.30.0/24", netName}) create.WaitWithDefaultTimeout() @@ -884,7 +884,7 @@ EXPOSE 2004-2005/tcp`, ALPINE) It("podman CNI network works across user ns", func() { SkipIfNetavark(podmanTest) - netName := stringid.GenerateNonCryptoID() + netName := stringid.GenerateRandomID() create := podmanTest.Podman([]string{"network", "create", netName}) create.WaitWithDefaultTimeout() Expect(create).Should(Exit(0)) @@ -933,7 +933,7 @@ EXPOSE 2004-2005/tcp`, ALPINE) }) It("podman run with new:pod and static-ip", func() { - netName := stringid.GenerateNonCryptoID() + netName := stringid.GenerateRandomID() ipAddr := "10.25.40.128" podname := "testpod" create := podmanTest.Podman([]string{"network", "create", "--subnet", "10.25.40.0/24", netName}) @@ -1121,7 +1121,7 @@ EXPOSE 2004-2005/tcp`, ALPINE) // see https://github.com/containers/podman/issues/12972 It("podman run check network-alias works on networks without dns", func() { - net := "dns" + stringid.GenerateNonCryptoID() + net := "dns" + stringid.GenerateRandomID() session := podmanTest.Podman([]string{"network", "create", "--disable-dns", net}) session.WaitWithDefaultTimeout() defer podmanTest.removeNetwork(net) @@ -1135,7 +1135,7 @@ EXPOSE 2004-2005/tcp`, ALPINE) It("podman run with ipam none driver", func() { // Test fails, issue #13931 SkipIfNetavark(podmanTest) - net := "ipam" + stringid.GenerateNonCryptoID() + net := "ipam" + stringid.GenerateRandomID() session := podmanTest.Podman([]string{"network", "create", "--ipam-driver=none", net}) session.WaitWithDefaultTimeout() defer podmanTest.removeNetwork(net) |