diff options
| author |  Janak Ramakrishnan <janakr@google.com> | 2015-10-06 20:11:46 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2015-10-07 07:10:17 +0000 |
| commit | ee0bade4968275603f86fe4b6bf700c7a6f944e1 (patch) | |
| tree | 1acf0a2b25ef5d1d4f0c7b0c97a04c734282e11c /src/test | |
| parent | eab38e8b28474046a1b036b73a32aebf224de3bb (diff) | |
Make Skyframe tests resilient to root causes not being stored.
--
MOS_MIGRATED_REVID=104791799
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java index 624190e3aa..550fea0773 100644 --- a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java @@ -337,7 +337,9 @@ public class MemoizingEvaluatorTest { initializeReporter(); EvaluationResult<StringValue> result = tester.eval(false, "top"); assertTrue(result.hasError()); - assertThat(result.getError(topKey).getRootCauses()).containsExactly(topKey); + if (i == 0 || rootCausesStored()) { + assertThat(result.getError(topKey).getRootCauses()).containsExactly(topKey); + } assertEquals(topKey.toString(), result.getError(topKey).getException().getMessage()); assertTrue(result.getError(topKey).getException() instanceof SomeErrorException); if (i == 0 || eventsStored()) { @@ -355,7 +357,9 @@ public class MemoizingEvaluatorTest { initializeReporter(); EvaluationResult<StringValue> result = tester.eval(false, "top"); assertTrue(result.hasError()); - assertThat(result.getError(topKey).getRootCauses()).containsExactly(topKey); + if (i == 0 || rootCausesStored()) { + assertThat(result.getError(topKey).getRootCauses()).containsExactly(topKey); + } assertEquals(topKey.toString(), result.getError(topKey).getException().getMessage()); assertTrue(result.getError(topKey).getException() instanceof SomeErrorException); if (i == 0 || eventsStored()) { @@ -2662,8 +2666,10 @@ public class MemoizingEvaluatorTest { assertThat(result.getError(midKey).getRootCauses()).containsExactly(badKey); // Do it again with keepGoing. We should also see an error for the top key this time. result = tester.eval(/*keepGoing=*/ true, topKey, midKey); - assertThat(result.getError(midKey).getRootCauses()).containsExactly(badKey); - assertThat(result.getError(topKey).getRootCauses()).containsExactly(badKey); + if (rootCausesStored()) { + assertThat(result.getError(midKey).getRootCauses()).containsExactly(badKey); + assertThat(result.getError(topKey).getRootCauses()).containsExactly(badKey); + } } @Test |