Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: failing tidy_all test failure in CI #336

Merged
merged 6 commits into from
Aug 7, 2023
Merged

fix: failing tidy_all test failure in CI #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
237a8c1
Add config to easily disable all caches
cgrindel Aug 7, 2023
27c63b1
Dump the tidy_out files
cgrindel Aug 7, 2023
0a81eee
Sort the output of find_tidy_out_files
cgrindel Aug 7, 2023
680c996
Remove debug
cgrindel Aug 7, 2023
de8ee25
Add back debug
cgrindel Aug 7, 2023
f736ff0
Sort the results of find_tidy_out_files
cgrindel Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions shared.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ build --nolegacy_important_outputs
build --bes_upload_mode=fully_async
run --bes_backend=
run --bes_results_url=

# Easily run without caches
common:no_cache --remote_cache= --disk_cache= --repository_cache=
10 changes: 5 additions & 5 deletions tests/bzltidy_tests/tidy_all_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ create_scratch_dir_sh="$(rlocation "${create_scratch_dir_sh_location}")" || \

find_tidy_out_files() {
local start_dir="$1"
find "${start_dir}" -name "*.tidy_out"
find "${start_dir}" -name "*.tidy_out" | sort -u
}

revert_changes() {
Expand Down Expand Up @@ -104,8 +104,8 @@ while IFS=$'\n' read -r line; do tidy_out_files+=("$line"); done < <(
find_tidy_out_files "${scratch_dir}"
)
assert_equal 2 ${#tidy_out_files[@]} "${assert_msg}"
assert_match parent\.tidy_out "${tidy_out_files[0]}" "${assert_msg}"
assert_match child_workspaces/bar/bar\.tidy_out "${tidy_out_files[1]}" "${assert_msg}"
assert_match child_workspaces/bar/bar\.tidy_out "${tidy_out_files[0]}" "${assert_msg}"
assert_match parent\.tidy_out "${tidy_out_files[1]}" "${assert_msg}"
assert_match \
"${output_prefix_regex}"\ Running\ //:my_tidy\ in\ .*child_workspaces/bar \
"${output}" "${assert_msg}"
Expand All @@ -119,6 +119,6 @@ while IFS=$'\n' read -r line; do tidy_out_files+=("$line"); done < <(
find_tidy_out_files "${scratch_dir}"
)
assert_equal 2 ${#tidy_out_files[@]} "${assert_msg}"
assert_match parent\.tidy_out "${tidy_out_files[0]}" "${assert_msg}"
assert_match child_workspaces/bar/bar\.tidy_out "${tidy_out_files[1]}" "${assert_msg}"
assert_match child_workspaces/bar/bar\.tidy_out "${tidy_out_files[0]}" "${assert_msg}"
assert_match parent\.tidy_out "${tidy_out_files[1]}" "${assert_msg}"
assert_match "${output_prefix_regex}"\ Skipping\ .*foo\. "${output}" "${assert_msg}"
Loading