| Index: tools/telemetry/telemetry/cros_interface_unittest.py | 
| diff --git a/tools/telemetry/telemetry/cros_interface_unittest.py b/tools/telemetry/telemetry/cros_interface_unittest.py | 
| deleted file mode 100644 | 
| index d65cc55aa669593d2cc002eeb65e43bbb1868bdb..0000000000000000000000000000000000000000 | 
| --- a/tools/telemetry/telemetry/cros_interface_unittest.py | 
| +++ /dev/null | 
| @@ -1,163 +0,0 @@ | 
| -# Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| -# Use of this source code is governed by a BSD-style license that can be | 
| -# found in the LICENSE file. | 
| - | 
| -# TODO(nduca): Rewrite what some of these tests to use mocks instead of | 
| -# actually talking to the device. This would improve our coverage quite | 
| -# a bit. | 
| -import unittest | 
| -import socket | 
| - | 
| -from telemetry import cros_browser_backend | 
| -from telemetry import cros_interface | 
| -from telemetry import options_for_unittests | 
| -from telemetry import run_tests | 
| -from telemetry import util | 
| - | 
| -class CrOSInterfaceTest(unittest.TestCase): | 
| -  @run_tests.RequiresBrowserOfType('cros-chrome') | 
| -  def testDeviceSideProcessFailureToLaunch(self): | 
| -    remote = options_for_unittests.GetCopy().cros_remote | 
| -    cri = cros_interface.CrOSInterface( | 
| -      remote, | 
| -      options_for_unittests.GetCopy().cros_ssh_identity) | 
| - | 
| -    def WillFail(): | 
| -      dsp = cros_interface.DeviceSideProcess( | 
| -        cri, | 
| -        ['sfsdfskjflwejfweoij']) | 
| -      dsp.Close() | 
| -    self.assertRaises(OSError, WillFail) | 
| - | 
| -  @run_tests.RequiresBrowserOfType('cros-chrome') | 
| -  def testDeviceSideProcessCloseDoesClose(self): | 
| -    remote = options_for_unittests.GetCopy().cros_remote | 
| -    cri = cros_interface.CrOSInterface( | 
| -      remote, | 
| -      options_for_unittests.GetCopy().cros_ssh_identity) | 
| - | 
| -    with cros_interface.DeviceSideProcess( | 
| -        cri, | 
| -        ['sleep', '111']) as dsp: | 
| -      procs = cri.ListProcesses() | 
| -      sleeps = [x for x in procs | 
| -                if x[1] == 'sleep 111'] | 
| -      assert dsp.IsAlive() | 
| -    procs = cri.ListProcesses() | 
| -    sleeps = [x for x in procs | 
| -              if x[1] == 'sleep 111'] | 
| -    self.assertEquals(len(sleeps), 0) | 
| - | 
| -  @run_tests.RequiresBrowserOfType('cros-chrome') | 
| -  def testPushContents(self): | 
| -    remote = options_for_unittests.GetCopy().cros_remote | 
| -    cri = cros_interface.CrOSInterface( | 
| -      remote, | 
| -      options_for_unittests.GetCopy().cros_ssh_identity) | 
| -    cri.GetCmdOutput(['rm', '-rf', '/tmp/testPushContents']) | 
| -    cri.PushContents('hello world', '/tmp/testPushContents') | 
| -    contents = cri.GetFileContents('/tmp/testPushContents') | 
| -    self.assertEquals(contents, 'hello world') | 
| - | 
| -  @run_tests.RequiresBrowserOfType('cros-chrome') | 
| -  def testExists(self): | 
| -    remote = options_for_unittests.GetCopy().cros_remote | 
| -    cri = cros_interface.CrOSInterface( | 
| -      remote, | 
| -      options_for_unittests.GetCopy().cros_ssh_identity) | 
| -    self.assertTrue(cri.FileExistsOnDevice('/proc/cpuinfo')) | 
| -    self.assertTrue(cri.FileExistsOnDevice('/etc/passwd')) | 
| -    self.assertFalse(cri.FileExistsOnDevice('/etc/sdlfsdjflskfjsflj')) | 
| - | 
| -  @run_tests.RequiresBrowserOfType('cros-chrome') | 
| -  def testGetFileContents(self): # pylint: disable=R0201 | 
| -    remote = options_for_unittests.GetCopy().cros_remote | 
| -    cri = cros_interface.CrOSInterface( | 
| -      remote, | 
| -      options_for_unittests.GetCopy().cros_ssh_identity) | 
| -    hosts = cri.GetFileContents('/etc/hosts') | 
| -    assert hosts.startswith('# /etc/hosts') | 
| - | 
| -  @run_tests.RequiresBrowserOfType('cros-chrome') | 
| -  def testGetFileContentsForSomethingThatDoesntExist(self): | 
| -    remote = options_for_unittests.GetCopy().cros_remote | 
| -    cri = cros_interface.CrOSInterface( | 
| -      remote, | 
| -      options_for_unittests.GetCopy().cros_ssh_identity) | 
| -    self.assertRaises( | 
| -      OSError, | 
| -      lambda: cri.GetFileContents('/tmp/209fuslfskjf/dfsfsf')) | 
| - | 
| -  @run_tests.RequiresBrowserOfType('cros-chrome') | 
| -  def testListProcesses(self): # pylint: disable=R0201 | 
| -    remote = options_for_unittests.GetCopy().cros_remote | 
| -    cri = cros_interface.CrOSInterface( | 
| -      remote, | 
| -      options_for_unittests.GetCopy().cros_ssh_identity) | 
| -    with cros_interface.DeviceSideProcess( | 
| -        cri, | 
| -        ['sleep', '11']): | 
| -      procs = cri.ListProcesses() | 
| -      sleeps = [x for x in procs | 
| -                if x[1] == 'sleep 11'] | 
| - | 
| -      assert len(sleeps) == 1 | 
| - | 
| -  @run_tests.RequiresBrowserOfType('cros-chrome') | 
| -  def testIsServiceRunning(self): | 
| -    remote = options_for_unittests.GetCopy().cros_remote | 
| -    cri = cros_interface.CrOSInterface( | 
| -      remote, | 
| -      options_for_unittests.GetCopy().cros_ssh_identity) | 
| - | 
| -    self.assertTrue(cri.IsServiceRunning('openssh-server')) | 
| - | 
| -  @run_tests.RequiresBrowserOfType('cros-chrome') | 
| -  def testGetRemotePortAndIsHTTPServerRunningOnPort(self): | 
| -    remote = options_for_unittests.GetCopy().cros_remote | 
| -    cri = cros_interface.CrOSInterface( | 
| -      remote, | 
| -      options_for_unittests.GetCopy().cros_ssh_identity) | 
| - | 
| -    # Create local server. | 
| -    sock = socket.socket() | 
| -    sock.bind(('', 0)) | 
| -    port = sock.getsockname()[1] | 
| -    sock.listen(0) | 
| - | 
| -    # Get remote port and ensure that it was unused. | 
| -    remote_port = cri.GetRemotePort() | 
| -    self.assertFalse(cri.IsHTTPServerRunningOnPort(remote_port)) | 
| - | 
| -    # Forward local server's port to remote device's remote_port. | 
| -    forwarder = cros_browser_backend.SSHForwarder( | 
| -        cri, 'R', util.PortPair(port, remote_port)) | 
| - | 
| -    # At this point, remote device should be able to connect to local server. | 
| -    self.assertTrue(cri.IsHTTPServerRunningOnPort(remote_port)) | 
| - | 
| -    # Next remote port shouldn't be the same as remote_port, since remote_port | 
| -    # is now in use. | 
| -    self.assertTrue(cri.GetRemotePort() != remote_port) | 
| - | 
| -    # Close forwarder and local server ports. | 
| -    forwarder.Close() | 
| -    sock.close() | 
| - | 
| -    # Device should no longer be able to connect to remote_port since it is no | 
| -    # longer in use. | 
| -    self.assertFalse(cri.IsHTTPServerRunningOnPort(remote_port)) | 
| - | 
| -  @run_tests.RequiresBrowserOfType('cros-chrome') | 
| -  def testGetRemotePortReservedPorts(self): | 
| -    remote = options_for_unittests.GetCopy().cros_remote | 
| -    cri = cros_interface.CrOSInterface( | 
| -      remote, | 
| -      options_for_unittests.GetCopy().cros_ssh_identity) | 
| - | 
| -    # Should return 2 separate ports even though the first one isn't technically | 
| -    # being used yet. | 
| -    remote_port_1 = cri.GetRemotePort() | 
| -    remote_port_2 = cri.GetRemotePort() | 
| - | 
| -    self.assertTrue(remote_port_1 != remote_port_2) | 
|  |