Skip to content

Commit

Permalink
[ios] Fix net unit test missing data for ios
Browse files Browse the repository at this point in the history
Partial revert of crrev.com/c/3158943

New files were added (data/quic_http_response_cache_data/*) and
added manually in the BUILD file, without updating
the bundle script.

Later someone else ran the script, which removed
those files. So now, this is causing failures on bots that
don't have the files from previous runs, like:
https://ci.chromium.org/ui/p/chromium/builders/ci/ios-simulator/66476/overview

Bug: 1249818
Change-Id: Iaa80cf71c5c6edd5e20aa6daa4508cce667d2bff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3162120
Commit-Queue: David Jean <djean@chromium.org>
Owners-Override: David Jean <djean@chromium.org>
Auto-Submit: David Jean <djean@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/main@{#921616}
  • Loading branch information
David Jean authored and Chromium LUCI CQ committed Sep 15, 2021
1 parent c8c714a commit 1011de7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions net/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1782,6 +1782,8 @@ bundle_data("test_support_bundle_data") {
visibility = [ ":test_support" ]
testonly = true
sources = [
"data/quic_http_response_cache_data/test.example.com/index.html",
"data/quic_http_response_cache_data/test.example.com/map.html",
"data/quic_http_response_cache_data_with_push/test.example.com/favicon.ico",
"data/quic_http_response_cache_data_with_push/test.example.com/index.html",
"data/quic_http_response_cache_data_with_push/test.example.com/index2.html",
Expand Down
3 changes: 2 additions & 1 deletion net/tools/update_ios_bundle_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

# This is a bit more expansive than it needs to be (includes README). Meh.
test_support_bundle_data_globs = [
"data/quic_http_response_cache_data/test.example.com/*",
"data/quic_http_response_cache_data_with_push/test.example.com/*",
"data/ssl/certificates/*",
]
Expand Down Expand Up @@ -125,7 +126,7 @@ def format_file_list(files):
def replace_sources(data, sources_regex, globs):
m = sources_regex.search(data)
if not m:
fatal("Couldn't find the sources section: %s" % sources_regex.pattern)
fatal("Couldn't find the sources section: %s" % sources_regex.pattern)

formatted_files = format_file_list(resolve_file_globs(globs))
return data[0:m.start(1)] + formatted_files + data[m.end(1):]
Expand Down

0 comments on commit 1011de7

Please sign in to comment.