Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: Fix a few remaining issues from the test renaming #24692

Merged
merged 2 commits into from
Mar 15, 2020
Merged

test: Fix a few remaining issues from the test renaming #24692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
948fa8c
test: Fix a few remaining issues from the test renaming
smarterclayton Mar 13, 2020
28939df
test: Fix TestImageStreamMappingCreate to not flake
smarterclayton Mar 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/extended/builds/build_pruning.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ var _ = g.Describe("[sig-devex][Feature:Builds] prune builds based on settings i

})

g.It("[Conformance] buildconfigs should have a default history limit set when created via the group api", func() {
g.It("buildconfigs should have a default history limit set when created via the group api", func() {

g.By("creating a build config with the group api")
err := oc.Run("create").Args("-f", groupBuildConfig).Execute()
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/custom_build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[sig-devex][Feature:Builds][Conformance] custom build with buildah", func() {
var _ = g.Describe("[sig-devex][Feature:Builds] custom build with buildah", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("custom-build", exutil.KubeConfigPath())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/docker_pullsecret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[sig-devex][Feature:Builds][pullsecret][Conformance] docker build using a pull secret", func() {
var _ = g.Describe("[sig-devex][Feature:Builds][pullsecret] docker build using a pull secret", func() {
defer g.GinkgoRecover()
const (
buildTestPod = "build-test-pod"
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/imagechangetriggers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[sig-devex][Feature:Builds][Conformance] imagechangetriggers", func() {
var _ = g.Describe("[sig-devex][Feature:Builds] imagechangetriggers", func() {
defer g.GinkgoRecover()

var (
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/multistage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ COPY --from=busybox:latest /bin/ping /test/
}
})

g.It("should succeed [Conformance]", func() {
g.It("should succeed", func() {
g.By("creating a build directly")
registryURL, err := eximages.GetDockerRegistryURL(oc)
o.Expect(err).NotTo(o.HaveOccurred())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/new_app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const (
a59 = "a2345678901234567890123456789012345678901234567890123456789"
)

var _ = g.Describe("[sig-devex][Feature:Builds][Conformance] oc new-app", func() {
var _ = g.Describe("[sig-devex][Feature:Builds] oc new-app", func() {
// Previously, the maximum length of app names creatable by new-app has
// inadvertently been decreased, e.g. by creating an annotation somewhere
// whose name itself includes the app name. Ensure we can create and fully
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/no_outputname.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[sig-devex][Feature:Builds][Conformance] build without output image", func() {
var _ = g.Describe("[sig-devex][Feature:Builds] build without output image", func() {
defer g.GinkgoRecover()
var (
dockerImageFixture = exutil.FixturePath("testdata", "builds", "test-docker-no-outputname.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/optimized.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ USER 1001
}
})

g.It("should succeed [Conformance]", func() {
g.It("should succeed", func() {
g.By("creating a build directly")
build, err := oc.AdminBuildClient().BuildV1().Builds(oc.Namespace()).Create(&buildv1.Build{
ObjectMeta: metav1.ObjectMeta{
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/remove_buildconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[sig-devex][Feature:Builds][Conformance] remove all builds when build configuration is removed", func() {
var _ = g.Describe("[sig-devex][Feature:Builds] remove all builds when build configuration is removed", func() {
defer g.GinkgoRecover()
var (
buildFixture = exutil.FixturePath("testdata", "builds", "test-build.yaml")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/s2i_quota.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[sig-devex][Feature:Builds][Conformance] s2i build with a quota", func() {
var _ = g.Describe("[sig-devex][Feature:Builds] s2i build with a quota", func() {
defer g.GinkgoRecover()
const (
buildTestPod = "build-test-pod"
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/s2i_root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func After(oc *exutil.CLI) {
}
}

var _ = g.Describe("[sig-devex][Feature:Builds][Conformance] s2i build with a root user image", func() {
var _ = g.Describe("[sig-devex][Feature:Builds] s2i build with a root user image", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("s2i-build-root", exutil.KubeConfigPath())

Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[sig-devex][Feature:Builds][Conformance] build can reference a cluster service", func() {
var _ = g.Describe("[sig-devex][Feature:Builds] build can reference a cluster service", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("build-service", exutil.KubeConfigPath())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/valuefrom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[sig-devex][Feature:Builds][Conformance][valueFrom] process valueFrom in build strategy environment variables", func() {
var _ = g.Describe("[sig-devex][Feature:Builds][valueFrom] process valueFrom in build strategy environment variables", func() {
var (
valueFromBaseDir = exutil.FixturePath("testdata", "builds", "valuefrom")
testImageStreamFixture = filepath.Join(valueFromBaseDir, "test-is.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/cli/rsh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[sig-cli]oc rsh[Conformance]", func() {
var _ = g.Describe("[sig-cli] oc rsh", func() {
defer g.GinkgoRecover()

var (
Expand Down
46 changes: 23 additions & 23 deletions test/extended/deployments/deployments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
imageChangeTriggerFixture = exutil.FixturePath("testdata", "deployments", "deployment-trigger.yaml")
)

g.Describe("when run iteratively [Conformance]", func() {
g.Describe("when run iteratively", func() {
dcName := "deployment-simple"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -280,7 +280,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("should respect image stream tag reference policy [Conformance]", func() {
g.Describe("should respect image stream tag reference policy", func() {
dcName := "deployment-image-resolution"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -328,7 +328,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("with test deployments [Conformance]", func() {
g.Describe("with test deployments", func() {
dcName := "deployment-test"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -412,7 +412,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("when changing image change trigger [Conformance]", func() {
g.Describe("when changing image change trigger", func() {
dcName := "example"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -464,7 +464,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("when tagging images [Conformance]", func() {
g.Describe("when tagging images", func() {
dcName := "tag-images"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -509,7 +509,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("with env in params referencing the configmap [Conformance]", func() {
g.Describe("with env in params referencing the configmap", func() {
dcName := "deployment-simple"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand All @@ -536,7 +536,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("with multiple image change triggers [Conformance]", func() {
g.Describe("with multiple image change triggers", func() {
dcName := "example"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand All @@ -561,7 +561,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("with enhanced status [Conformance]", func() {
g.Describe("with enhanced status", func() {
dcName := "deployment-simple"

g.AfterEach(func() {
Expand Down Expand Up @@ -595,7 +595,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("with custom deployments [Conformance]", func() {
g.Describe("with custom deployments", func() {
dcName := "custom-deployment"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -632,7 +632,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("viewing rollout history [Conformance]", func() {
g.Describe("viewing rollout history", func() {
dcName := "deployment-simple"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -683,7 +683,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("generation [Conformance]", func() {
g.Describe("generation", func() {
dcName := "generation-test"
g.AfterEach(func() {
failureTrap(oc, "generation-test", g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -772,7 +772,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("paused [Conformance]", func() {
g.Describe("paused", func() {
dcName := "paused"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -835,7 +835,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("with failing hook [Conformance]", func() {
g.Describe("with failing hook", func() {
dcName := "hook"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand All @@ -858,7 +858,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("rolled back [Conformance]", func() {
g.Describe("rolled back", func() {
dcName := "deployment-simple"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -905,7 +905,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("reaper [Conformance][Slow]", func() {
g.Describe("reaper [Slow]", func() {
dcName := "brokendeployment"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -946,7 +946,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("initially [Conformance]", func() {
g.Describe("initially", func() {
dcName := "readiness"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand All @@ -963,7 +963,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("with revision history limits [Conformance]", func() {
g.Describe("with revision history limits", func() {
dcName := "history-limit"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -1028,7 +1028,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("with minimum ready seconds set [Conformance]", func() {
g.Describe("with minimum ready seconds set", func() {
dcName := "minreadytest"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -1113,7 +1113,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("ignores deployer and lets the config with a NewReplicationControllerCreated reason [Conformance]", func() {
g.Describe("ignores deployer and lets the config with a NewReplicationControllerCreated reason", func() {
dcName := "database"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down Expand Up @@ -1162,7 +1162,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
failureTrapForDetachedRCs(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
})

g.It("should adhere to Three Laws of Controllers [Conformance]", func() {
g.It("should adhere to Three Laws of Controllers", func() {
namespace := oc.Namespace()
rcName := func(i int) string { return fmt.Sprintf("%s-%d", dcName, i) }

Expand Down Expand Up @@ -1257,7 +1257,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("keep the deployer pod invariant valid [Conformance]", func() {
g.Describe("keep the deployer pod invariant valid", func() {
dcName := "deployment-simple"
const deploymentCancelledAnnotation = "openshift.io/deployment.cancelled"

Expand Down Expand Up @@ -1484,7 +1484,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("won't deploy RC with unresolved images [Conformance]", func() {
g.Describe("won't deploy RC with unresolved images", func() {
dcName := "example"
rcName := func(i int) string { return fmt.Sprintf("%s-%d", dcName, i) }
g.AfterEach(func() {
Expand Down Expand Up @@ -1561,7 +1561,7 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})
})

g.Describe("adoption [Conformance]", func() {
g.Describe("adoption", func() {
dcName := "deployment-simple"
g.AfterEach(func() {
failureTrap(oc, dcName, g.CurrentGinkgoTestDescription().Failed)
Expand Down
2 changes: 1 addition & 1 deletion test/extended/dns/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ func ipsForEndpoints(ep *kapiv1.Endpoints) []string {
var _ = Describe("[sig-network-edge] DNS", func() {
f := e2e.NewDefaultFramework("dns")

It("should answer endpoint and wildcard queries for the cluster [Conformance]", func() {
It("should answer endpoint and wildcard queries for the cluster", func() {
if _, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(createServiceSpec("headless", true, "", nil)); err != nil {
e2e.Failf("unable to create headless service: %v", err)
}
Expand Down
14 changes: 7 additions & 7 deletions test/extended/idling/idling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ var _ = g.Describe("[sig-network-edge][Feature:Idling] Idling and unidling", fun
os.Remove(idlingFile)
})

g.Describe("idling [local]", func() {
g.Context("with a single service and DeploymentConfig [Conformance]", func() {
g.Describe("idling [Local]", func() {
g.Context("with a single service and DeploymentConfig", func() {
g.BeforeEach(func() {
framework.BeforeEach()
fixture = echoServerFixture
Expand Down Expand Up @@ -283,7 +283,7 @@ var _ = g.Describe("[sig-network-edge][Feature:Idling] Idling and unidling", fun
fixture = echoServerFixture
})

g.It("should work with TCP (when fully idled) [Conformance] [local]", func() {
g.It("should work with TCP (when fully idled) [Local]", func() {
g.By("Idling the service")
_, err := oc.Run("idle").Args("--resource-names-file", idlingFile).Output()
o.Expect(err).ToNot(o.HaveOccurred())
Expand Down Expand Up @@ -312,7 +312,7 @@ var _ = g.Describe("[sig-network-edge][Feature:Idling] Idling and unidling", fun
o.Expect(endpoints.Annotations).NotTo(o.HaveKey(unidlingapi.UnidleTargetAnnotation))
})

g.It("should work with TCP (while idling) [local]", func() {
g.It("should work with TCP (while idling) [Local]", func() {
g.By("Idling the service")
_, err := oc.Run("idle").Args("--resource-names-file", idlingFile).Output()
o.Expect(err).ToNot(o.HaveOccurred())
Expand All @@ -336,7 +336,7 @@ var _ = g.Describe("[sig-network-edge][Feature:Idling] Idling and unidling", fun
o.Expect(endpoints.Annotations).NotTo(o.HaveKey(unidlingapi.UnidleTargetAnnotation))
})

g.It("should handle many TCP connections by dropping those under a certain bound [local]", func() {
g.It("should handle many TCP connections by dropping those under a certain bound [Local]", func() {
g.By("Idling the service")
_, err := oc.Run("idle").Args("--resource-names-file", idlingFile).Output()
o.Expect(err).ToNot(o.HaveOccurred())
Expand Down Expand Up @@ -388,7 +388,7 @@ var _ = g.Describe("[sig-network-edge][Feature:Idling] Idling and unidling", fun
o.Expect(endpoints.Annotations).NotTo(o.HaveKey(unidlingapi.UnidleTargetAnnotation))
})

g.It("should work with UDP [local]", func() {
g.It("should work with UDP [Local]", func() {
g.By("Idling the service")
_, err := oc.Run("idle").Args("--resource-names-file", idlingFile).Output()
o.Expect(err).ToNot(o.HaveOccurred())
Expand Down Expand Up @@ -418,7 +418,7 @@ var _ = g.Describe("[sig-network-edge][Feature:Idling] Idling and unidling", fun
})

// TODO: Work out how to make this test work correctly when run on AWS
g.XIt("should handle many UDP senders (by continuing to drop all packets on the floor) [local]", func() {
g.XIt("should handle many UDP senders (by continuing to drop all packets on the floor) [Local]", func() {
g.By("Idling the service")
_, err := oc.Run("idle").Args("--resource-names-file", idlingFile).Output()
o.Expect(err).ToNot(o.HaveOccurred())
Expand Down