mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
Merge pull request #82664 from johnSchnake/disruptiveConformanceTest
Allow disruptive conformance tests and tag 2 as such
This commit is contained in:
commit
4568c61526
@ -44,7 +44,7 @@ var (
|
||||
totalConfTests, totalLegacyTests, missingComments int
|
||||
|
||||
// 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"
|
||||
|
@ -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]",
|
||||
"[Flaky]",
|
||||
},
|
||||
{
|
||||
"a disruptive test case that is invalid [Disruptive]",
|
||||
"[Disruptive]",
|
||||
},
|
||||
{
|
||||
"a feature test case that is invalid [Feature:Awesome]",
|
||||
"[Feature:Awesome]",
|
||||
@ -176,12 +172,12 @@ func TestValidateTestName(t *testing.T) {
|
||||
"[Alpha]",
|
||||
},
|
||||
{
|
||||
"a test case with multiple invalid tags [Flaky][Disruptive] [Feature:Awesome] [Alpha]",
|
||||
"[Flaky],[Disruptive],[Feature:Awesome],[Alpha]",
|
||||
"a test case with multiple invalid tags [Flaky] [Feature:Awesome] [Alpha]",
|
||||
"[Flaky],[Feature:Awesome],[Alpha]",
|
||||
},
|
||||
{
|
||||
"[sig-awesome] [Disruptive] a test case with valid and invalid tags [Alpha] [Serial] [Flaky]",
|
||||
"[Disruptive],[Alpha],[Flaky]",
|
||||
"[sig-awesome] [Alpha] [Disruptive] a test case with valid and invalid tags [Serial] [Flaky]",
|
||||
"[Alpha],[Flaky]",
|
||||
},
|
||||
}
|
||||
for i, tc := range testCases {
|
||||
|
@ -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
|
||||
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"
|
||||
pod := createPodForTaintsTest(true, 2*additionalWaitPerDeleteSeconds, podName, podName, ns)
|
||||
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
|
||||
the toleration time limit.
|
||||
*/
|
||||
framework.ConformanceIt("evicts pods with minTolerationSeconds", func() {
|
||||
framework.ConformanceIt("evicts pods with minTolerationSeconds [Disruptive]", func() {
|
||||
podGroup := "taint-eviction-b"
|
||||
observedDeletions := make(chan string, 100)
|
||||
stopCh := make(chan struct{})
|
||||
|
Loading…
Reference in New Issue
Block a user