BEP: Merge all failures into the Aborted event

In this way, for each event there can only be two event payloads
for every event identifier: the expected one, and the Aborted event.
The type of failure will be reported in the AbortReason enum value.

Change-Id: Icce225ec156d1fc20c8facd18df13343712f775c
PiperOrigin-RevId: 162911732

1 files changed, 10 insertions, 10 deletions

diff --git a/src/test/shell/integration/build_event_stream_test.sh b/src/test/shell/integration/build_event_stream_test.sh
index 93b2d5fd38..c89fa0eb6d 100755
--- a/src/test/shell/integration/build_event_stream_test.sh
+++ b/src/test/shell/integration/build_event_stream_test.sh
@@ -481,33 +481,33 @@ function test_loading_failure() {
   (bazel build --build_event_text_file=$TEST_log \
          //does/not/exist && fail "build failure expected") || true
   expect_log_once '^progress '
-  expect_log_once '^loading_failed'
-  expect_log 'details.*BUILD file not found on package path'
+  expect_log_once 'aborted'
+  expect_log_once 'reason: LOADING_FAILURE'
+  expect_log 'description.*BUILD file not found on package path'
   expect_not_log 'expanded'
-  expect_not_log 'aborted'
 }
 
 function test_visibility_failure() {
   bazel shutdown
   (bazel build --build_event_text_file=$TEST_log \
          //visibility:cannotsee && fail "build failure expected") || true
-  expect_log '^analysis_failed'
-  expect_not_log '^aborted'
+  expect_log_once 'reason: ANALYSIS_FAILURE'
+  expect_log_once '^aborted'
 
   # The same should hold true, if the server has already analyzed the target
   (bazel build --build_event_text_file=$TEST_log \
          //visibility:cannotsee && fail "build failure expected") || true
-  expect_log '^analysis_failed'
-  expect_not_log '^aborted'
+  expect_log_once 'reason: ANALYSIS_FAILURE'
+  expect_log_once '^aborted'
 }
 
 function test_loading_failure_keep_going() {
   (bazel build --build_event_text_file=$TEST_log \
          -k //does/not/exist && fail "build failure expected") || true
-  expect_log_once '^loading_failed'
+  expect_log_once 'aborted'
+  expect_log_once 'reason: LOADING_FAILURE'
   expect_log_once '^expanded'
-  expect_log 'details.*BUILD file not found on package path'
-  expect_not_log 'aborted'
+  expect_log 'description.*BUILD file not found on package path'
 }
 
 # TODO(aehlig): readd, once we stop reporting the important artifacts