Skip to content

Commit 25f114c

Browse files
committed
skip: UnderStress* should skip all stress runs
We previously thought that the fact that skip.UnderStress has been ineffective in engflow that it was OK to change the behaviour to only apply to dev builds. But this is not the case for the Extended CI pipeline which still runs pre-merge. Epic: none Release note: None
1 parent 22e573c commit 25f114c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pkg/testutils/skip/skip.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func UnderShort(t SkippableTest, args ...interface{}) {
127127
// UnderStress skips this test when running under stress.
128128
func UnderStress(t SkippableTest, args ...interface{}) {
129129
t.Helper()
130-
if DevStress() {
130+
if Stress() {
131131
maybeSkip(t, "disabled under stress", args...)
132132
}
133133
}
@@ -136,7 +136,7 @@ func UnderStress(t SkippableTest, args ...interface{}) {
136136
// given issue ID as the reason.
137137
func UnderStressWithIssue(t SkippableTest, githubIssueID int, args ...interface{}) {
138138
t.Helper()
139-
if DevStress() {
139+
if Stress() {
140140
maybeSkip(t, withIssue("disabled under stress", githubIssueID), args...)
141141
}
142142
}
@@ -191,7 +191,7 @@ func UnderDuressWithIssue(t SkippableTest, githubIssueID int, args ...interface{
191191
// Duress captures the conditions that currently lead us to believe that tests
192192
// may be slower than normal.
193193
func Duress() bool {
194-
return util.RaceEnabled || DevStress() || syncutil.DeadlockEnabled
194+
return util.RaceEnabled || Stress() || syncutil.DeadlockEnabled
195195
}
196196

197197
// UnderBench returns true iff a test is currently running under `go
@@ -225,7 +225,7 @@ func OnArch(t SkippableTest, arch string, args ...interface{}) {
225225

226226
func testConfig() string {
227227
configs := []string{}
228-
if DevStress() {
228+
if Stress() {
229229
configs = append(configs, "stress")
230230
}
231231
if util.RaceEnabled {

0 commit comments

Comments
 (0)