Skip to content

Commit

Permalink
Stop checking for messages in PaintController death tests
Browse files Browse the repository at this point in the history
These strings don't exist in official builds, which makes the test fail.
Furthermore, they don't add much value.

BUG=710470
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2

Review-Url: https://codereview.chromium.org/2823603002
Cr-Commit-Position: refs/heads/master@{#464744}
  • Loading branch information
chrishtr authored and Commit bot committed Apr 14, 2017
1 parent 446bcc3 commit c288893
Showing 1 changed file with 5 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2276,7 +2276,7 @@ class PaintControllerUnderInvalidationTest
};

TEST_F(PaintControllerUnderInvalidationTest, ChangeDrawing) {
EXPECT_DEATH(TestChangeDrawing(), "under-invalidation: display item changed");
EXPECT_DEATH(TestChangeDrawing(), "");
}

TEST_F(PaintControllerUnderInvalidationTest, MoreDrawing) {
Expand All @@ -2297,29 +2297,22 @@ TEST_F(PaintControllerUnderInvalidationTest, NoopPairsInSubsequence) {
}

TEST_F(PaintControllerUnderInvalidationTest, ChangeDrawingInSubsequence) {
EXPECT_DEATH(TestChangeDrawingInSubsequence(),
"\"\\(In cached subsequence of first\\)\" under-invalidation: "
"display item changed");
EXPECT_DEATH(TestChangeDrawingInSubsequence(), "");
}

TEST_F(PaintControllerUnderInvalidationTest, MoreDrawingInSubsequence) {
EXPECT_DEATH(TestMoreDrawingInSubsequence(),
"Check failed: false. Can't find cached display item");
EXPECT_DEATH(TestMoreDrawingInSubsequence(), "");
}

TEST_F(PaintControllerUnderInvalidationTest, LessDrawingInSubsequence) {
// We allow invalidated display item clients as long as they would produce the
// same display items. The cases of changed display items are tested by other
// test cases.
EXPECT_DEATH(TestLessDrawingInSubsequence(),
"\"\\(In cached subsequence of first\\)\" under-invalidation: "
"new subsequence wrong length");
EXPECT_DEATH(TestLessDrawingInSubsequence(), "");
}

TEST_F(PaintControllerUnderInvalidationTest, ChangeNonCacheableInSubsequence) {
EXPECT_DEATH(TestChangeNonCacheableInSubsequence(),
"\"\\(In cached subsequence of container\\)\" "
"under-invalidation: display item changed");
EXPECT_DEATH(TestChangeNonCacheableInSubsequence(), "");
}

TEST_F(PaintControllerUnderInvalidationTest, InvalidationInSubsequence) {
Expand Down

0 comments on commit c288893

Please sign in to comment.