diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-09 10:55:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-09 10:55:15 -0400 |
commit | fa01b838a6867c46576afcab35eaefde6e1c4abe (patch) | |
tree | fa5cfaff85733c755c5173b118ce718881b45dbb /test/e2e/network_test.go | |
parent | 71d675a164ee64111db1a9214673a3498b3aa123 (diff) | |
parent | fea78d5530f996d008912584761433023491f160 (diff) | |
download | podman-fa01b838a6867c46576afcab35eaefde6e1c4abe.tar.gz podman-fa01b838a6867c46576afcab35eaefde6e1c4abe.tar.bz2 podman-fa01b838a6867c46576afcab35eaefde6e1c4abe.zip |
Merge pull request #7891 from rhatdan/rm
This PR allows users to remove external containers directly
Diffstat (limited to 'test/e2e/network_test.go')
-rw-r--r-- | test/e2e/network_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index a15359ea3..cbfd72da6 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -28,7 +28,7 @@ func removeConf(confPath string) { // generateNetworkConfig generates a cni config with a random name // it returns the network name and the filepath func generateNetworkConfig(p *PodmanTestIntegration) (string, string) { - // generate a random name to preven conflicts with other tests + // generate a random name to prevent conflicts with other tests name := "net" + stringid.GenerateNonCryptoID() path := filepath.Join(p.CNIConfigDir, fmt.Sprintf("%s.conflist", name)) conf := fmt.Sprintf(`{ |