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.

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

Make focus and skip a lot easier to use in extended tests #15915

Merged
merged 3 commits into from
Sep 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/extended/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ variable `FOCUS='regex'` where 'regex' is a regular expression matching the
description of the test you want to run. For example one of the s2i tests
(s2i_incremental.go) defines:

var _ = g.Describe("[builds][Slow] incremental s2i build", func() {
var _ = g.Describe("[Feature:Builds][Slow] incremental s2i build", func() {

So you can write a focus regex that includes this test by setting
`FOCUS='\[builds\]'` or `FOCUS='incremental s2i'`.
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/build_pruning.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
// These build pruning tests create 4 builds and check that 2-3 of them are left after pruning.
// This variation in the number of builds that could be left is caused by the HandleBuildPruning
// function using cached information from the buildLister.
var _ = g.Describe("[builds][pruning] prune builds based on settings in the buildconfig", func() {
var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in the buildconfig", func() {
var (
buildPruningBaseDir = exutil.FixturePath("testdata", "build-pruning")
isFixture = filepath.Join(buildPruningBaseDir, "imagestream.yaml")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/build_timing.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func verifyStages(stages []buildapi.StageInfo, expectedStages map[string][]strin
}
}

var _ = g.Describe("[builds][timing] capture build stages and durations", func() {
var _ = g.Describe("[Feature:Builds][timing] capture build stages and durations", func() {
var (
buildTimingBaseDir = exutil.FixturePath("testdata", "build-timing")
isFixture = filepath.Join(buildTimingBaseDir, "test-is.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/buildconfigsecretinjector.go
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("[builds] buildconfig secret injector", func() {
var _ = g.Describe("[Feature:Builds] buildconfig secret injector", func() {
defer g.GinkgoRecover()

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

var _ = g.Describe("[builds][Slow] builds should have deadlines", func() {
var _ = g.Describe("[Feature:Builds][Slow] builds should have deadlines", func() {
defer g.GinkgoRecover()
var (
sourceFixture = exutil.FixturePath("testdata", "test-cds-sourcebuild.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/contextdir.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[builds][Slow] builds with a context directory", func() {
var _ = g.Describe("[Feature:Builds][Slow] builds with a context directory", func() {
defer g.GinkgoRecover()
var (
appFixture = exutil.FixturePath("testdata", "test-context-build.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/digest.go
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("[builds][Slow] completed builds should have digest of the image in their status", func() {
var _ = g.Describe("[Feature:Builds][Slow] completed builds should have digest of the image in their status", func() {
defer g.GinkgoRecover()
var (
imageStreamFixture = exutil.FixturePath("..", "integration", "testdata", "test-image-stream.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/docker_pullsecret.go
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("[builds][pullsecret][Conformance] docker build using a pull secret", func() {
var _ = g.Describe("[Feature:Builds][pullsecret][Conformance] 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/docker_quota.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[builds][quota][Slow] docker build with a quota", func() {
var _ = g.Describe("[Feature:Builds][quota][Slow] docker build with a quota", func() {
defer g.GinkgoRecover()
const (
buildTestPod = "build-test-pod"
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/dockerfile.go
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("[builds][Slow] build can have Dockerfile input", func() {
var _ = g.Describe("[Feature:Builds][Slow] build can have Dockerfile input", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("build-dockerfile-env", exutil.KubeConfigPath())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/failure_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[builds][Slow] update failure status", func() {
var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
defer g.GinkgoRecover()

var (
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/forcepull.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ while this test is running and compare results. Restarting your docker daemon,
be a quick fix.
*/

var _ = g.Describe("[builds] forcePull should affect pulling builder images", func() {
var _ = g.Describe("[Feature:Builds] forcePull should affect pulling builder images", func() {
defer g.GinkgoRecover()
var oc = exutil.NewCLI("forcepull", exutil.KubeConfigPath())

Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/gitauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func hostname(hostport string) (string, error) {
return host, err
}

var _ = g.Describe("[builds][Slow] can use private repositories as build input", func() {
var _ = g.Describe("[Feature:Builds][Slow] can use private repositories as build input", func() {
defer g.GinkgoRecover()

const (
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/hooks.go
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("[builds][Slow] testing build configuration hooks", func() {
var _ = g.Describe("[Feature:Builds][Slow] testing build configuration hooks", func() {
defer g.GinkgoRecover()
var (
buildFixture = exutil.FixturePath("testdata", "test-build-postcommit.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/image_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[builds][Slow] build can have Docker image source", func() {
var _ = g.Describe("[Feature:Builds][Slow] build can have Docker image source", func() {
defer g.GinkgoRecover()
var (
buildFixture = exutil.FixturePath("testdata", "test-imagesource-build.yaml")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/labels.go
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("[builds][Slow] result image should have proper labels set", func() {
var _ = g.Describe("[Feature:Builds][Slow] result image should have proper labels set", func() {
defer g.GinkgoRecover()
var (
imageStreamFixture = exutil.FixturePath("..", "integration", "testdata", "test-image-stream.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/long_names.go
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("[builds][Slow] extremely long build/bc names are not problematic", func() {
var _ = g.Describe("[Feature:Builds][Slow] extremely long build/bc names are not problematic", func() {
defer g.GinkgoRecover()
var (
testDataBaseDir = exutil.FixturePath("testdata", "long_names")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/new_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const (
a59 = "a2345678901234567890123456789012345678901234567890123456789"
)

var _ = g.Describe("[builds][Conformance] oc new-app", func() {
var _ = g.Describe("[Feature:Builds][Conformance] 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
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("[builds][Conformance] build without output image", func() {
var _ = g.Describe("[Feature:Builds][Conformance] build without output image", func() {
defer g.GinkgoRecover()
var (
dockerImageFixture = exutil.FixturePath("testdata", "test-docker-no-outputname.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/nosrc.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[builds] build with empty source", func() {
var _ = g.Describe("[Feature:Builds] build with empty source", func() {
defer g.GinkgoRecover()
var (
buildFixture = exutil.FixturePath("testdata", "test-nosrc-build.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/optimized.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[builds] Optimized image builds", func() {
var _ = g.Describe("[Feature:Builds] Optimized image builds", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("build-dockerfile-env", exutil.KubeConfigPath())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func debugAnyJenkinsFailure(br *exutil.BuildResult, name string, oc *exutil.CLI,
}
}

var _ = g.Describe("[builds][Slow] openshift pipeline build", func() {
var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
defer g.GinkgoRecover()
var (
jenkinsTemplatePath = exutil.FixturePath("..", "..", "examples", "jenkins", "jenkins-ephemeral-template.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[builds][Slow] the s2i build should support proxies", func() {
var _ = g.Describe("[Feature:Builds][Slow] the s2i build should support proxies", func() {
defer g.GinkgoRecover()
var (
buildFixture = exutil.FixturePath("testdata", "test-build-proxy.yaml")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/remove_buildconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

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

var _ = g.Describe("[builds] build have source revision metadata", func() {
var _ = g.Describe("[Feature:Builds] build have source revision metadata", func() {
defer g.GinkgoRecover()
var (
buildFixture = exutil.FixturePath("testdata", "test-build-revision.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/run_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
)

// this test is very latency sensitive so run it by itself (serially).
var _ = g.Describe("[builds][Slow][Serial] using build configuration runPolicy", func() {
var _ = g.Describe("[Feature:Builds][Slow][Serial] using build configuration runPolicy", func() {
defer g.GinkgoRecover()
var (
// Use invalid source here as we don't care about the result
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/s2i_dropcaps.go
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("[builds][Slow] Capabilities should be dropped for s2i builders", func() {
var _ = g.Describe("[Feature:Builds][Slow] Capabilities should be dropped for s2i builders", func() {
defer g.GinkgoRecover()
var (
s2ibuilderFixture = exutil.FixturePath("testdata", "s2i-dropcaps", "rootable-ruby")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/s2i_env.go
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("[builds][Slow] s2i build with environment file in sources", func() {
var _ = g.Describe("[Feature:Builds][Slow] s2i build with environment file in sources", func() {
defer g.GinkgoRecover()
const (
buildTestPod = "build-test-pod"
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/s2i_extended_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
e2e "k8s.io/kubernetes/test/e2e/framework"
)

var _ = g.Describe("[builds][Slow] s2i extended build", func() {
var _ = g.Describe("[Feature:Builds][Slow] s2i extended build", func() {
defer g.GinkgoRecover()

var (
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/s2i_incremental.go
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("[builds][Slow] incremental s2i build", func() {
var _ = g.Describe("[Feature:Builds][Slow] incremental s2i build", func() {
defer g.GinkgoRecover()

const (
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/s2i_quota.go
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("[builds][Conformance] s2i build with a quota", func() {
var _ = g.Describe("[Feature:Builds][Conformance] 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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
s2istatus "github.com/openshift/source-to-image/pkg/util/status"
)

var _ = g.Describe("[builds][Conformance] s2i build with a root user image", func() {
var _ = g.Describe("[Feature:Builds][Conformance] s2i build with a root user image", func() {
defer g.GinkgoRecover()

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

var _ = g.Describe("[builds][Slow] can use build secrets", func() {
var _ = g.Describe("[Feature:Builds][Slow] can use build secrets", func() {
defer g.GinkgoRecover()
var (
buildSecretBaseDir = exutil.FixturePath("testdata", "build-secrets")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[builds][Slow] starting a build using CLI", func() {
var _ = g.Describe("[Feature:Builds][Slow] starting a build using CLI", func() {
defer g.GinkgoRecover()
var (
buildFixture = exutil.FixturePath("testdata", "test-build.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/valuefrom.go
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("[builds][Conformance][valueFrom] process valueFrom in build strategy environment variables", func() {
var _ = g.Describe("[Feature:Builds][Conformance][valueFrom] process valueFrom in build strategy environment variables", func() {
var (
valueFromBaseDir = exutil.FixturePath("testdata", "valuefrom")
testImageStreamFixture = filepath.Join(valueFromBaseDir, "test-is.json")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/deployments/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
const deploymentRunTimeout = 5 * time.Minute
const deploymentChangeTimeout = 30 * time.Second

var _ = g.Describe("deploymentconfigs", func() {
var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("cli-deployment", exutil.KubeConfigPath())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/networking/isolation.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
. "github.com/onsi/gomega"
)

var _ = Describe("[networking] network isolation", func() {
var _ = Describe("[Area:Networking] network isolation", func() {
InSingleTenantContext(func() {
f1 := e2e.NewDefaultFramework("net-isolation1")
f2 := e2e.NewDefaultFramework("net-isolation2")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/networking/multicast.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
. "github.com/onsi/gomega"
)

var _ = Describe("[networking] multicast", func() {
var _ = Describe("[Area:Networking] multicast", func() {
InSingleTenantContext(func() {
oc := testexutil.NewCLI("multicast", testexutil.KubeConfigPath())
f := oc.KubeFramework()
Expand Down
2 changes: 1 addition & 1 deletion test/extended/networking/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
. "github.com/onsi/gomega"
)

var _ = Describe("[networking] services", func() {
var _ = Describe("[Area:Networking] services", func() {
Context("basic functionality", func() {
f1 := e2e.NewDefaultFramework("net-services1")

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

var _ = g.Describe("[Feature:Prometheus][builds] Prometheus", func() {
var _ = g.Describe("[Feature:Prometheus][Feature:Builds] Prometheus", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("prometheus", exutil.KubeConfigPath())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/router/headers.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[Conformance][networking][router] router headers", func() {
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router] router headers", func() {
defer g.GinkgoRecover()
var (
configPath = exutil.FixturePath("testdata", "router-http-echo-server.yaml")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/router/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[Conformance][networking][router] openshift router metrics", func() {
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router] openshift router metrics", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("router-metrics", exutil.KubeConfigPath())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/router/reencrypt.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[Conformance][networking][router]", func() {
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
defer g.GinkgoRecover()
var (
configPath = exutil.FixturePath("testdata", "reencrypt-serving-cert.yaml")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/router/scoped.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

const changeTimeoutSeconds = 3 * 60

var _ = g.Describe("[Conformance][networking][router] openshift routers", func() {
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router] openshift routers", func() {
defer g.GinkgoRecover()
var (
configPath = exutil.FixturePath("testdata", "scoped-router.yaml")
Expand Down
Loading