From d0c314e381266efe9fcacbf3b6fccc509b320b44 Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Thu, 15 Dec 2022 02:17:54 -0800 Subject: [PATCH] Fix `//src/test/java/net/starlark/java/eval:ScriptTest` on M1 Macs Fixes #17005 Closes #17017. PiperOrigin-RevId: 495539579 Change-Id: Id4b368e847d0570d6b492280f76469398ec8d9a5 --- .bazelci/postsubmit.yml | 2 -- .bazelci/presubmit.yml | 2 -- src/test/java/net/starlark/java/eval/testdata/json.star | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml index b2897e4273ad95..baf5edb5c88cc7 100644 --- a/.bazelci/postsubmit.yml +++ b/.bazelci/postsubmit.yml @@ -262,8 +262,6 @@ tasks: - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests" # https://github.com/bazelbuild/bazel/issues/16975 - "-//scripts/docs:rewriter_test" - # https://github.com/bazelbuild/bazel/issues/17005 - - "-//src/test/java/net/starlark/java/eval:ScriptTest" # https://github.com/bazelbuild/bazel/issues/17006 - "-//src/test/java/com/google/devtools/build/lib/remote:BuildWithoutTheBytesIntegrationTest" # https://github.com/bazelbuild/bazel/issues/17007 diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 8d6b3ed8455e75..bdb6dfc9cfe5ae 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -255,8 +255,6 @@ tasks: - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests" # https://github.com/bazelbuild/bazel/issues/16975 - "-//scripts/docs:rewriter_test" - # https://github.com/bazelbuild/bazel/issues/17005 - - "-//src/test/java/net/starlark/java/eval:ScriptTest" # https://github.com/bazelbuild/bazel/issues/17006 - "-//src/test/java/com/google/devtools/build/lib/remote:BuildWithoutTheBytesIntegrationTest" # https://github.com/bazelbuild/bazel/issues/17007 diff --git a/src/test/java/net/starlark/java/eval/testdata/json.star b/src/test/java/net/starlark/java/eval/testdata/json.star index 51180b44860b2d..76351e5f94119b 100644 --- a/src/test/java/net/starlark/java/eval/testdata/json.star +++ b/src/test/java/net/starlark/java/eval/testdata/json.star @@ -44,7 +44,7 @@ assert_fails(lambda: json.encode(struct(x = [1, {"x": len}])), "in struct field .x: at list index 1: in dict key \"x\": cannot encode builtin_function_or_method as JSON") def f(deep): - for x in range(10000): + for x in range(100000): deep = [deep] json.encode(deep) assert_fails(lambda: f(None), "nesting depth limit exceeded") @@ -128,7 +128,7 @@ assert_fails(lambda: json.decode('{1:2}'), "got int for object key, want string" assert_fails(lambda: json.decode('{"one": 1,'), "unexpected end of file") assert_fails(lambda: json.decode('{"one": 1, }'), 'unexpected character "}"') # FIXME assert_fails(lambda: json.decode('{"one": 1]'), 'in object, got "]", want ',' or \'}\'') -assert_fails(lambda: json.decode('[' * 10000), "nesting depth limit exceeded") +assert_fails(lambda: json.decode('[' * 100000), "nesting depth limit exceeded") # Unescaped control codes (even tabs) are forbidden in strings. assert_fails(lambda: json.decode('"\t"'), r"invalid character '\\x09' in string literal") assert_fails(lambda: json.decode('"\\u123"'), r"incomplete \\uXXXX escape")