Skip to content

don't mangle config.GinkgoConfig.FocusString #16842

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

Closed
jim-minter wants to merge 1 commit into from
Closed

don't mangle config.GinkgoConfig.FocusString #16842

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 18 additions & 19 deletions test/extended/util/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,6 @@ func ExecuteTest(t *testing.T, suite string) {
defer e2e.CoreDump(reportDir)
}

switch syntheticSuite {
case "parallel.conformance.openshift.io":
if len(config.GinkgoConfig.FocusString) > 0 {
config.GinkgoConfig.FocusString += "|"
}
config.GinkgoConfig.FocusString = "\\[Suite:openshift/conformance/parallel\\]"
case "serial.conformance.openshift.io":
if len(config.GinkgoConfig.FocusString) > 0 {
config.GinkgoConfig.FocusString += "|"
}
config.GinkgoConfig.FocusString = "\\[Suite:openshift/conformance/serial\\]"
}
if config.GinkgoConfig.FocusString == "" && config.GinkgoConfig.SkipString == "" {
config.GinkgoConfig.SkipString = "Skipped"
}
Expand All @@ -128,29 +116,40 @@ func ExecuteTest(t *testing.T, suite string) {

ginkgo.WalkTests(func(name string, node types.TestNode) {
isSerial := serialTestsFilter.MatchString(name)
isConformance := conformanceTestsFilter.MatchString(name)
isExcluded := excludedTestsFilter.MatchString(name)

if isSerial {
if !strings.Contains(name, "[Serial]") {
node.SetText(node.Text() + " [Serial]")
}
}

if !excludedTestsFilter.MatchString(name) {
include := conformanceTestsFilter.MatchString(name)
switch {
case !include:
// do nothing
case isSerial:
if !isExcluded && isConformance {
Copy link
Contributor

@smarterclayton smarterclayton Oct 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't refactor this chunk of code, it's orthogonal to your change.

if isSerial {
node.SetText(node.Text() + " [Suite:openshift/conformance/serial]")
case include:
} else {
node.SetText(node.Text() + " [Suite:openshift/conformance/parallel]")
}
}

if strings.Contains(node.CodeLocation().FileName, "/origin/test/") && !strings.Contains(node.Text(), "[Suite:openshift") {
node.SetText(node.Text() + " [Suite:openshift]")
}
if strings.Contains(node.CodeLocation().FileName, "/kubernetes/test/e2e/") {
node.SetText(node.Text() + " [Suite:k8s]")
}

switch syntheticSuite {
Copy link
Contributor

@smarterclayton smarterclayton Oct 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not do this.

case "parallel.conformance.openshift.io":
if isExcluded || !isConformance || isSerial {
node.SetFlag(types.FlagTypePending)
}
case "serial.conformance.openshift.io":
if isExcluded || !isConformance || !isSerial {
node.SetFlag(types.FlagTypePending)
}
}
})

if quiet {
Expand Down