[catapult android trybot] Make Telemetry tests run on Android

telemetry/telemetry/internal/platform/android_device_unittest.py

Index: telemetry/telemetry/internal/platform/android_device_unittest.py
diff --git a/telemetry/telemetry/internal/platform/android_device_unittest.py b/telemetry/telemetry/internal/platform/android_device_unittest.py
index c6aa064019292cc897bd69dc8c5f8b17b5b1f850..ac09935b31720378d597e34279235bb11f2ceb2e 100644
--- a/telemetry/telemetry/internal/platform/android_device_unittest.py
+++ b/telemetry/telemetry/internal/platform/android_device_unittest.py
@@ -58,7 +58,8 @@ class AndroidDeviceTest(_BaseAndroidDeviceTest):
       self.assertEquals([], self._android_device_stub.logging.warnings)
       self.assertIsNone(android_device.GetDevice(finder_options))
 
-  @decorators.Enabled('android')
+  # https://github.com/catapult-project/catapult/issues/3099 (Android)
+  @decorators.Disabled('all')
   def testAdbNoDevicesReturnsNone(self):
     finder_options = browser_options.BrowserFinderOptions()
     with mock.patch('os.path.isabs', return_value=False):
@@ -66,7 +67,8 @@ class AndroidDeviceTest(_BaseAndroidDeviceTest):
       self.assertEquals([], self._android_device_stub.logging.warnings)
       self.assertIsNone(android_device.GetDevice(finder_options))
 
-  @decorators.Enabled('android')
+  # https://github.com/catapult-project/catapult/issues/3099 (Android)
+  @decorators.Disabled('all')
   def testAdbTwoDevicesReturnsNone(self):
     finder_options = browser_options.BrowserFinderOptions()
     with mock.patch('os.path.isabs', return_value=False):
@@ -95,7 +97,8 @@ class AndroidDeviceTest(_BaseAndroidDeviceTest):
       self.assertEquals([], self._android_device_stub.logging.warnings)
       self.assertEquals('555d14fecddddddd', device.device_id)
 
-  @decorators.Enabled('android')
+  # https://github.com/catapult-project/catapult/issues/3099 (Android)
+  @decorators.Disabled('all')
   def testAdbOneDeviceReturnsDeviceInstance(self):
     finder_options = browser_options.BrowserFinderOptions()
     with mock.patch('os.path.isabs', return_value=False):
@@ -107,7 +110,8 @@ class AndroidDeviceTest(_BaseAndroidDeviceTest):
 
 
 class FindAllAvailableDevicesTest(_BaseAndroidDeviceTest):
-  @decorators.Enabled('android')
+  # https://github.com/catapult-project/catapult/issues/3099 (Android)
+  @decorators.Disabled('all')
   def testAdbNoDeviceReturnsEmptyList(self):
     finder_options = browser_options.BrowserFinderOptions()
     with mock.patch('os.path.isabs', return_value=False):
@@ -117,7 +121,8 @@ class FindAllAvailableDevicesTest(_BaseAndroidDeviceTest):
       self.assertIsNotNone(devices)
       self.assertEquals(len(devices), 0)
 
-  @decorators.Enabled('android')
+  # https://github.com/catapult-project/catapult/issues/3099 (Android)
+  @decorators.Disabled('all')
   def testAdbOneDeviceReturnsListWithOneDeviceInstance(self):
     finder_options = browser_options.BrowserFinderOptions()
     with mock.patch('os.path.isabs', return_value=False):
@@ -129,7 +134,8 @@ class FindAllAvailableDevicesTest(_BaseAndroidDeviceTest):
       self.assertEquals(len(devices), 1)
       self.assertEquals('015d14fec128220c', devices[0].device_id)
 
-  @decorators.Enabled('android')
+  # https://github.com/catapult-project/catapult/issues/3099 (Android)
+  @decorators.Disabled('all')
   def testAdbMultipleDevicesReturnsListWithAllDeviceInstances(self):
     finder_options = browser_options.BrowserFinderOptions()
     with mock.patch('os.path.isabs', return_value=False):