Commit d8a15fbb authored by Patrick Noland's avatar Patrick Noland Committed by Commit Bot

Mark MediaTest tests as flaky

Bug:1098806

Tbr: dominickn@chromium.org
Change-Id: I85a5d9fe282450d466c8942adfbee70d03347f90
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2264617Reviewed-by: default avatarPatrick Noland <pnoland@chromium.org>
Commit-Queue: Patrick Noland <pnoland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781941}
parent 2fd8eb0f
...@@ -13,6 +13,7 @@ import org.junit.runner.RunWith; ...@@ -13,6 +13,7 @@ import org.junit.runner.RunWith;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.FlakyTest;
import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.permissions.PermissionTestRule.PermissionUpdateWaiter; import org.chromium.chrome.browser.permissions.PermissionTestRule.PermissionUpdateWaiter;
import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.Tab;
...@@ -57,6 +58,7 @@ public class MediaTest { ...@@ -57,6 +58,7 @@ public class MediaTest {
@MediumTest @MediumTest
@Feature({"MediaPermissions", "Main"}) @Feature({"MediaPermissions", "Main"})
@CommandLineFlags.Add({FAKE_DEVICE}) @CommandLineFlags.Add({FAKE_DEVICE})
@FlakyTest
public void testMicrophoneMediaPermissionsPlumbingDialog() throws Exception { public void testMicrophoneMediaPermissionsPlumbingDialog() throws Exception {
testMediaPermissionsPlumbing("Mic count:", "initiate_getMicrophone()", 1, true, true); testMediaPermissionsPlumbing("Mic count:", "initiate_getMicrophone()", 1, true, true);
} }
...@@ -70,6 +72,7 @@ public class MediaTest { ...@@ -70,6 +72,7 @@ public class MediaTest {
@MediumTest @MediumTest
@Feature({"MediaPermissions", "Main"}) @Feature({"MediaPermissions", "Main"})
@CommandLineFlags.Add({FAKE_DEVICE}) @CommandLineFlags.Add({FAKE_DEVICE})
@FlakyTest
public void testCameraPermissionsPlumbingDialog() throws Exception { public void testCameraPermissionsPlumbingDialog() throws Exception {
testMediaPermissionsPlumbing("Camera count:", "initiate_getCamera()", 1, false, true); testMediaPermissionsPlumbing("Camera count:", "initiate_getCamera()", 1, false, true);
} }
...@@ -83,6 +86,7 @@ public class MediaTest { ...@@ -83,6 +86,7 @@ public class MediaTest {
@MediumTest @MediumTest
@Feature({"MediaPermissions", "Main"}) @Feature({"MediaPermissions", "Main"})
@CommandLineFlags.Add({FAKE_DEVICE}) @CommandLineFlags.Add({FAKE_DEVICE})
@FlakyTest
public void testCombinedPermissionsPlumbingDialog() throws Exception { public void testCombinedPermissionsPlumbingDialog() throws Exception {
testMediaPermissionsPlumbing("Combined count:", "initiate_getCombined()", 1, true, true); testMediaPermissionsPlumbing("Combined count:", "initiate_getCombined()", 1, true, true);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment