*: replace "testdata" with sed scripts #75125
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
otan
force-pushed
the
super_bazel
branch
9 times, most recently
from
c5458b6
to
1e6addb
Compare
|
Looks like you've got just a few more failing tests. |
otan
force-pushed
the
super_bazel
branch
2 times, most recently
from
abbf6d2
to
0e34104
Compare
Prep for a super `sed` replace. Release note: None
Steps:
```
ag 'filepath.Join\("testdata",' -G '_test\.go$' -l | xargs sed -i '' -e 's/filepath.Join("testdata", /testutils.TestDataPath(t, /g'
ag 'filepath.Join\("testdata"\)' -G '_test\.go$' -l | xargs sed -i '' -e 's/filepath.Join("testdata")/testutils.TestDataPath(t)/g'
git diff --name-only | xargs -I {} crlfmt -w {}
make bazel-generate
```
Release note: None
…Path(t)` Generated with: ``` ag '"testdata"' -G '_test\.go$' -l | xargs sed -i '' -e 's/datadriven.Walk(t, "testdata"/datadriven.Walk(t, testutils.TestDataPath(t)/g' -- crlfmt and bazel generate ``` Release note: None
Also try and break down `/` as much as possible. ``` -- fix the slashes ag '"testdata/' -G '_test\.go$' pkg -l | xargs sed -i '' -e 's/"testdata\/\([^"]*\)"/testutils.TestDataPath(t, "\1")/g' git diff --name-only | xargs sed -i '' -e 's_filepath.Join(testutils.TestDataPath(), "\([^/]*\)/\([^"]*\)"_testutils.TestDataPath(t, "\1", "\2")_g' git diff --name-only | xargs sed -i '' -e 's_filepath.Join(testutils.TestDataPath()\(.*,\) "\([^/]*\)/\([^"]*\)"_testutils.TestDataPath(t\1 "\2", "\3")_g' -- crlfmt and make generate ``` Also some manual fixes unfortunately... Release note: None
|
all good now |
otan
requested review from
adityamaru and
srosenberg
and removed request for
a team
rickystewart
approved these changes
Jan 19, 2022
|
remaining failure looks like an unrelated timeout bors r=rickystewart |
|
bors r=rickystewart |
|
Already running a review |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Not a proper audit, but 80% of the way there.
Refs: #71928
See individual commits for details