Skip to content

*: bump the datadriven dependency and update the calls#42736

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20191125-bump-datadriven
Nov 26, 2019
Merged

*: bump the datadriven dependency and update the calls#42736
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20191125-bump-datadriven

Conversation

@knz
Copy link
Copy Markdown
Contributor

@knz knz commented Nov 25, 2019

For use with cockroachdb/datadriven#7.

The datadriven.RunTest function uses sub-tests for each directive in
the input file. Since it's not valid to use t.Fatal, t.Skip etc on
a parent test while there is a sub-test testing.T active, the
RunTest interface has been updated so that the callback function
gets the sub-test as argument.

This patch bumps the dependency and updates the calls to RunTest
accordingly.

Release note: None

@knz knz requested a review from tbg November 25, 2019 17:16
@knz knz requested review from a team as code owners November 25, 2019 17:16
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@knz
Copy link
Copy Markdown
Contributor Author

knz commented Nov 25, 2019

I'll wait for some discussion on cockroachdb/datadriven#8 before merging this.

If we end up removing the sub-tests, then the interface change is not required.

@knz
Copy link
Copy Markdown
Contributor Author

knz commented Nov 26, 2019

I have thought about this more. Regardless of the discussion on cockroachdb/datadriven#8 it's desirable to pass the *testing.T instance, for a different reason: soon enough we'll teach datadriven about sub-test sections (like the SQL logic tests already have) and this will also need this.

So merging nonetheless.

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Nov 26, 2019

Merge conflict

@knz knz force-pushed the 20191125-bump-datadriven branch from bee94fc to 5739fe5 Compare November 26, 2019 10:36
The `datadriven.RunTest` function uses sub-tests for each directive in
the input file. Since it's not valid to use `t.Fatal`, `t.Skip` etc on
a parent test while there is a sub-test `testing.T` active, the
`RunTest` interface has been updated so that the callback function
gets the sub-test as argument.

This patch bumps the dependency and updates the calls to `RunTest`
accordingly.

Release note: None
@knz knz force-pushed the 20191125-bump-datadriven branch from 5739fe5 to 96910cd Compare November 26, 2019 10:43
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Nov 26, 2019

bors r+

craig bot pushed a commit that referenced this pull request Nov 26, 2019
42736: *: bump the `datadriven` dependency and update the calls r=knz a=knz

For use with cockroachdb/datadriven#7.

The `datadriven.RunTest` function uses sub-tests for each directive in
the input file. Since it's not valid to use `t.Fatal`, `t.Skip` etc on
a parent test while there is a sub-test `testing.T` active, the
`RunTest` interface has been updated so that the callback function
gets the sub-test as argument.

This patch bumps the dependency and updates the calls to `RunTest`
accordingly.

Release note: None

Co-authored-by: Raphael 'kena' Poss <knz@thaumogen.net>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Nov 26, 2019

Build succeeded

@craig craig bot merged commit 96910cd into cockroachdb:master Nov 26, 2019
@knz knz deleted the 20191125-bump-datadriven branch November 26, 2019 11:42
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.

4 participants