aboutsummaryrefslogtreecommitdiff
path: root/test/e2e/common_test.go
diff options
context:
space:
mode:
authorKir Kolyshkin <kolyshkin@gmail.com>2022-09-13 15:13:09 -0700
committerKir Kolyshkin <kolyshkin@gmail.com>2022-09-13 16:26:26 -0700
commit75740be39541296d379e34902e11ba49e96a1867 (patch)
tree9b4a5a807803d399787d0466221f25dab6240064 /test/e2e/common_test.go
parentc64388728f5efec2658cf9097dbe15126f30753e (diff)
downloadpodman-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/common_test.go')
-rw-r--r--test/e2e/common_test.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 8fe89f32e..690e2f22c 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -306,7 +306,7 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
// happens. So, use a podman-%s.sock-lock empty file as a marker.
tries := 0
for {
- uuid := stringid.GenerateNonCryptoID()
+ uuid := stringid.GenerateRandomID()
lockPath := fmt.Sprintf("%s-%s.sock-lock", pathPrefix, uuid)
lockFile, err := os.OpenFile(lockPath, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0700)
if err == nil {
@@ -894,7 +894,7 @@ func generateNetworkConfig(p *PodmanTestIntegration) (string, string) {
conf string
)
// generate a random name to prevent conflicts with other tests
- name := "net" + stringid.GenerateNonCryptoID()
+ name := "net" + stringid.GenerateRandomID()
if p.NetworkBackend != Netavark {
path = filepath.Join(p.NetworkConfigDir, fmt.Sprintf("%s.conflist", name))
conf = fmt.Sprintf(`{
@@ -1030,7 +1030,7 @@ func ncz(port int) bool {
}
func createNetworkName(name string) string {
- return name + stringid.GenerateNonCryptoID()[:10]
+ return name + stringid.GenerateRandomID()[:10]
}
var IPRegex = `(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}`