Skip to content

sql/logictests: don't fail parent test when using retry#84420

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
stevendanna:retry-fails-parent
Aug 1, 2022
Merged

sql/logictests: don't fail parent test when using retry#84420
craig[bot] merged 1 commit intocockroachdb:masterfrom
stevendanna:retry-fails-parent

Conversation

@stevendanna
Copy link
Copy Markdown
Collaborator

testutils.SucceedsSoon calls Fatal() on the passed testing.T. Here,
we were calling SucceedsSoon with the root T, which in the case of a
subtest resulted in this error showing up in our logs

testing.go:1169: test executed panic(nil) or runtime.Goexit:
subtest may have called FailNow on a parent test

This moves to using SucceedsSoonError so that we can process errors
using the same formatting that we use elsewhere.

Release note: None

testutils.SucceedsSoon calls Fatal() on the passed testing.T.  Here,
we were calling SucceedsSoon with the root T, which in the case of a
subtest resulted in this error showing up in our logs

    testing.go:1169: test executed panic(nil) or runtime.Goexit:
    subtest may have called FailNow on a parent test

This moves to using SucceedsSoonError so that we can process errors
using the same formatting that we use elsewhere.

Release note: None
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@stevendanna
Copy link
Copy Markdown
Collaborator Author

Bazel failure is #84122

Copy link
Copy Markdown
Contributor

@knz knz left a comment

Choose a reason for hiding this comment

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

nice 💯

@stevendanna
Copy link
Copy Markdown
Collaborator Author

bors r=knz

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jul 18, 2022

Build failed:

@stevendanna
Copy link
Copy Markdown
Collaborator Author

bors retry

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 1, 2022

Build succeeded:

@craig craig bot merged commit 590049f into cockroachdb:master Aug 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants