github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82664 from johnSchnake/disruptiveConformanceTest

Browse Source 
Allow disruptive conformance tests and tag 2 as such
This commit is contained in:
Kubernetes Prow Robot 2019-09-25 11:06:27 -07:00 committed by GitHub
commit 4568c61526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/conformance/walk.go
View File

@ -44,7 +44,7 @@ var (
totalConfTests, totalLegacyTests, missingComments int totalConfTests, totalLegacyTests, missingComments int
// If a test name contains any of these tags, it is ineligble for promotion to conformance // If a test name contains any of these tags, it is ineligble for promotion to conformance
regexIneligibleTags = regexp.MustCompile(`\[(Alpha|Disruptive|Feature:[^\]]+|Flaky)\]`) regexIneligibleTags = regexp.MustCompile(`\[(Alpha|Feature:[^\]]+|Flaky)\]`)
) )
const regexDescribe = "Describe|KubeDescribe|SIGDescribe" const regexDescribe = "Describe|KubeDescribe|SIGDescribe"

14
test/conformance/walk_test.go
View File

@ -156,17 +156,13 @@ func TestValidateTestName(t *testing.T) {
"", "",
}, },
{ {
"a test case with valid tags [LinuxOnly] [NodeConformance] [Serial]", "a test case with valid tags [LinuxOnly] [NodeConformance] [Serial] [Disruptive]",
"", "",
}, },
{ {
"a flaky test case that is invalid [Flaky]", "a flaky test case that is invalid [Flaky]",
"[Flaky]", "[Flaky]",
}, },
{
"a disruptive test case that is invalid [Disruptive]",
"[Disruptive]",
},
{ {
"a feature test case that is invalid [Feature:Awesome]", "a feature test case that is invalid [Feature:Awesome]",
"[Feature:Awesome]", "[Feature:Awesome]",
@ -176,12 +172,12 @@ func TestValidateTestName(t *testing.T) {
"[Alpha]", "[Alpha]",
}, },
{ {
"a test case with multiple invalid tags [Flaky][Disruptive] [Feature:Awesome] [Alpha]", "a test case with multiple invalid tags [Flaky] [Feature:Awesome] [Alpha]",
"[Flaky],[Disruptive],[Feature:Awesome],[Alpha]", "[Flaky],[Feature:Awesome],[Alpha]",
}, },
{ {
"[sig-awesome] [Disruptive] a test case with valid and invalid tags [Alpha] [Serial] [Flaky]", "[sig-awesome] [Alpha] [Disruptive] a test case with valid and invalid tags [Serial] [Flaky]",
"[Disruptive],[Alpha],[Flaky]", "[Alpha],[Flaky]",
}, },
} }
for i, tc := range testCases { for i, tc := range testCases {

4
test/e2e/scheduling/taints.go
View File

@ -283,7 +283,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Single Pod [Serial]", func() {
Description: The Pod with toleration timeout scheduled on a tainted Node MUST not be Description: The Pod with toleration timeout scheduled on a tainted Node MUST not be
evicted if the taint is removed before toleration time ends. evicted if the taint is removed before toleration time ends.
*/ */
framework.ConformanceIt("removing taint cancels eviction", func() { framework.ConformanceIt("removing taint cancels eviction [Disruptive]", func() {
podName := "taint-eviction-4" podName := "taint-eviction-4"
pod := createPodForTaintsTest(true, 2*additionalWaitPerDeleteSeconds, podName, podName, ns) pod := createPodForTaintsTest(true, 2*additionalWaitPerDeleteSeconds, podName, podName, ns)
observedDeletions := make(chan string, 100) observedDeletions := make(chan string, 100)
@ -413,7 +413,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Multiple Pods [Serial]", func() {
Description: In a multi-pods scenario with tolerationSeconds, the pods MUST be evicted as per Description: In a multi-pods scenario with tolerationSeconds, the pods MUST be evicted as per
the toleration time limit. the toleration time limit.
*/ */
framework.ConformanceIt("evicts pods with minTolerationSeconds", func() { framework.ConformanceIt("evicts pods with minTolerationSeconds [Disruptive]", func() {
podGroup := "taint-eviction-b" podGroup := "taint-eviction-b"
observedDeletions := make(chan string, 100) observedDeletions := make(chan string, 100)
stopCh := make(chan struct{}) stopCh := make(chan struct{})