From e93c61e14b5cf6e22f6fa3632a6bf7a62d3e6693 Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Mon, 30 Jan 2023 07:42:49 -0800 Subject: [PATCH] Add worker assertions resource_processing_integration_test Adding a few assertions to the worker and multiplex worker tests to ensure that the expected workers are in fact coming up. Closes #15952. PiperOrigin-RevId: 505690186 Change-Id: If732c9f040ec144395b5525a48d3a7d367fe244b --- .../resource_processing_integration_test.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/test/shell/bazel/android/resource_processing_integration_test.sh b/src/test/shell/bazel/android/resource_processing_integration_test.sh index 1c3bd1f858d541..718bad9c0111bf 100755 --- a/src/test/shell/bazel/android/resource_processing_integration_test.sh +++ b/src/test/shell/bazel/android/resource_processing_integration_test.sh @@ -111,7 +111,13 @@ function test_persistent_resource_processor() { create_android_binary setup_font_resources - assert_build //java/bazel:bin --persistent_android_resource_processor + assert_build //java/bazel:bin --persistent_android_resource_processor \ + --worker_verbose &> $TEST_log + expect_log "Created new non-sandboxed AndroidResourceParser worker (id [0-9]\+)" + expect_log "Created new non-sandboxed AndroidResourceCompiler worker (id [0-9]\+)" + expect_log "Created new non-sandboxed AndroidCompiledResourceMerger worker (id [0-9]\+)" + expect_log "Created new non-sandboxed AndroidAapt2 worker (id [0-9]\+)" + expect_log "Created new non-sandboxed ManifestMerger worker (id [0-9]\+)" } function test_persistent_multiplex_resource_processor() { @@ -121,7 +127,13 @@ function test_persistent_multiplex_resource_processor() { setup_font_resources assert_build //java/bazel:bin --experimental_worker_multiplex \ - --persistent_multiplex_android_tools + --persistent_multiplex_android_tools \ + --worker_verbose &> $TEST_log + expect_log "Created new non-sandboxed AndroidResourceParser multiplex-worker (id [0-9]\+)" + expect_log "Created new non-sandboxed AndroidResourceCompiler multiplex-worker (id [0-9]\+)" + expect_log "Created new non-sandboxed AndroidCompiledResourceMerger multiplex-worker (id [0-9]\+)" + expect_log "Created new non-sandboxed AndroidAapt2 multiplex-worker (id [0-9]\+)" + expect_log "Created new non-sandboxed ManifestMerger multiplex-worker (id [0-9]\+)" } run_suite "Resource processing integration tests"