Remove stale android code and remove stand alone functionality.

appengine/swarming/swarming_bot/os_utilities_test.py

 #!/usr/bin/env python
 # Copyright 2014 The Swarming Authors. All rights reserved.
 # Use of this source code is governed by the Apache v2.0 license that can be
 # found in the LICENSE file.
 
 import logging
 import os
 import re
 import subprocess
 import sys
@@ skipping 111 matching lines @@
     expected = {
       u'cost_usd_hour', u'cwd', u'disks', u'gpu', u'ip', u'hostname',
       u'nb_files_in_temp', u'ram', u'running_time', u'started_ts',
     }
     if sys.platform in ('cygwin', 'win32'):
       expected.add(u'cygwin')
     if sys.platform == 'win32':
       expected.add(u'integrity')
     self.assertEqual(expected, set(actual))
 
-  def test_get_adb_list_devices(self):
-    stdout = (
-      '* daemon not running. starting it now on port 5037 *\n'
-      '* daemon started successfully *\n'
-      'List of devices attached\n'
-      'A12B304C5DE     device\n'
-      'emulator-1234   device\n'
-      '\n')
-    self.mock(subprocess, 'check_output', lambda *_: stdout)
-    actual = os_utilities.get_adb_list_devices()
-    self.assertEqual(['A12B304C5DE', 'emulator-1234'], actual)
-
-  def test_get_adb_device_properties_raw(self):
-    stdout = (
-      '# begin build properties\n'
-      '# autogenerated by buildinfo.sh\n'
-      'ro.build.id=KRT16S\n'
-      'ro.build.display.id=KRT16S\n'
-      'ro.build.version.incremental=920375\n'
-      '\n')
-    self.mock(subprocess, 'check_output', lambda *_: stdout)
-    actual = os_utilities.get_adb_device_properties_raw('123')
-    expected = {
-      u'ro.build.display.id': u'KRT16S',
-      u'ro.build.id': u'KRT16S',
-      u'ro.build.version.incremental': u'920375',
-    }
-    self.assertEqual(expected, actual)
-
-  def test_get_dimensions_android(self):
-    props = dict((k, k) for k in os_utilities.ANDROID_DETAILS)
-    props[u'bar'] = u'foo'
-    self.mock(os_utilities, 'get_adb_device_properties_raw', lambda *_: props)
-    actual = os_utilities.get_dimensions_android('123')
-    expected = {
-      u'id': [u'123'],
-      u'ro.board.platform': [u'ro.board.platform'],
-      u'ro.build.id': [u'ro.build.id'],
-      u'ro.build.tags': [u'ro.build.tags'],
-      u'ro.build.type': [u'ro.build.type'],
-      u'ro.build.version.sdk': [u'ro.build.version.sdk'],
-      u'ro.product.board': [u'ro.product.board'],
-      u'ro.product.cpu.abi': [u'ro.product.cpu.abi'],
-      u'ro.product.cpu.abi2': [u'ro.product.cpu.abi2'],
-    }
-    self.assertEqual(expected, actual)
-
-  def test_get_state_android(self):
-    self.mock(time, 'time', lambda: os_utilities._STARTED_TS + 1)
-    expected_dimensions = dict((k, k) for k in os_utilities.ANDROID_DETAILS)
-    props = expected_dimensions.copy()
-    props[u'bar'] = u'foo'
-    self.mock(os_utilities, 'get_adb_device_properties_raw', lambda *_: props)
-
-    expected_dimensions[u'id'] = [u'123']
-    actual = os_utilities.get_state_android('123')
-    expected = {
-      u'device': {},
-      u'host': os_utilities.get_state(),
-    }
-    self.assertEqual(expected, actual)
-
   def test_setup_auto_startup_win(self):
     # TODO(maruel): Figure out a way to test properly.
     pass
 
   def test_setup_auto_startup_osx(self):
     # TODO(maruel): Figure out a way to test properly.
     pass
 
   def test_restart(self):
     class Foo(Exception):
@@ skipping 29 matching lines @@
     self.assertFalse(os_utilities.restart(timeout=60))
     self.assertEqual(time.time(), 60)
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
   unittest.main()