summaryrefslogtreecommitdiff
path: root/test/e2e/common_test.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-02-11 20:44:07 -0500
committerGitHub <noreply@github.com>2022-02-11 20:44:07 -0500
commiteb19a7582e445d120ea2c4fd166313179d8c10a8 (patch)
tree8e3c92b3522bc7b05f0f7608c9554ec6c882f751 /test/e2e/common_test.go
parent1b22ad95c172acc70af0a7c2d2145aa02353c02b (diff)
parent6f9f78f7f2395919f7f9a3a74f002119733e30e9 (diff)
downloadpodman-eb19a7582e445d120ea2c4fd166313179d8c10a8.tar.gz
podman-eb19a7582e445d120ea2c4fd166313179d8c10a8.tar.bz2
podman-eb19a7582e445d120ea2c4fd166313179d8c10a8.zip
Merge pull request #13144 from lsm5/e2e-netavark
enable netavark specific tests
Diffstat (limited to 'test/e2e/common_test.go')
-rw-r--r--test/e2e/common_test.go14
1 files changed, 9 insertions, 5 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index f843a8984..b1cd76d27 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -771,15 +771,15 @@ func SkipIfNotActive(unit string, reason string) {
}
}
-func SkipIfNetavark(p *PodmanTestIntegration) {
- if p.NetworkBackend == Netavark {
- Skip("This test is not compatible with the netavark network backend")
+func SkipIfCNI(p *PodmanTestIntegration) {
+ if p.NetworkBackend == CNI {
+ Skip("this test is not compatible with the CNI network backend")
}
}
-func SkipUntilAardvark(p *PodmanTestIntegration) {
+func SkipIfNetavark(p *PodmanTestIntegration) {
if p.NetworkBackend == Netavark {
- Skip("Re-enable when aardvark is functional")
+ Skip("This test is not compatible with the netavark network backend")
}
}
@@ -1038,3 +1038,7 @@ func ncz(port int) bool {
}
return false
}
+
+func createNetworkName(name string) string {
+ return name + stringid.GenerateNonCryptoID()[:10]
+}