diff options
author | Yorke Lee <yorkelee@google.com> | 2015-11-06 19:12:10 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-06 19:12:10 +0000 |
commit | c998ad318277d839ea57b1caee707befa10f89b9 (patch) | |
tree | aaa61d47a42a248dd65f8f2ef79d7feb40ea67e2 | |
parent | c06667d70d0866ca4cf1ab1aa9816195c5e47576 (diff) | |
parent | 6646ea2cda1bc56bf5b3980aaaf5ed62c5a01283 (diff) |
Merge "Temporarily supress flaky Tests" into ub-contactsdialer-a-dev am: 2ffa54ae8f
am: 6646ea2cda
* commit '6646ea2cda1bc56bf5b3980aaaf5ed62c5a01283':
Temporarily supress flaky Tests
-rw-r--r-- | tests/src/com/android/dialer/CallDetailActivityTest.java | 2 | ||||
-rw-r--r-- | tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/src/com/android/dialer/CallDetailActivityTest.java b/tests/src/com/android/dialer/CallDetailActivityTest.java index c310c8870..fec25f655 100644 --- a/tests/src/com/android/dialer/CallDetailActivityTest.java +++ b/tests/src/com/android/dialer/CallDetailActivityTest.java @@ -86,6 +86,7 @@ public class CallDetailActivityTest extends ActivityInstrumentationTestCase2<Cal /** * Verifies the trash menu item is present and a voicemail URI is set. */ + @Suppress public void testVoicemailDeleteButton() throws Throwable { setActivityIntentForTestVoicemailEntry(); startActivityUnderTest(); @@ -108,6 +109,7 @@ public class CallDetailActivityTest extends ActivityInstrumentationTestCase2<Cal /** * Verifies the trash menu item is present and a voicemail URI is not set. */ + @Suppress public void testRegularCallDoesHaveRemoveFromCallLog() throws Throwable { setActivityIntentForTestCallEntry(); startActivityUnderTest(); diff --git a/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java b/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java index 3a74f7395..630789cf7 100644 --- a/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java +++ b/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java @@ -29,6 +29,7 @@ import android.net.Uri; import android.provider.VoicemailContract; import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.LargeTest; +import android.test.suitebuilder.annotation.Suppress; import android.view.View; import android.widget.TextView; @@ -116,6 +117,7 @@ public class VoicemailPlaybackTest extends ActivityInstrumentationTestCase2<Call }); } + @Suppress public void testWhenCheckForContentCompletes() throws Throwable { setUriForRealFileVoicemailEntry(); setPlaybackViewForPresenter(); @@ -132,6 +134,7 @@ public class VoicemailPlaybackTest extends ActivityInstrumentationTestCase2<Call assertStateTextContains("Loading voicemail"); } + @Suppress public void testInvalidVoicemailShowsErrorMessage() throws Throwable { setUriForInvalidVoicemailEntry(); setPlaybackViewForPresenter(); |