[chromeos] Simplify chromeos device policy tests

chrome/test/pyautolib/chromeos/suid_actions.py

 #!/usr/bin/env python
 # 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.
 
 """Helper script to perform actions as a super-user on ChromeOS.
 
 Needs to be run with superuser privileges, typically using the
 suid_python binary.
 
 Usage:
   sudo python suid_actions.py --action=CleanFlimflamDirs
 """
 
 import logging

[bartfab (slow), 2012/07/30 08:59:45]

Nit: "logging" is no longer needed by this file

 import optparse
 import os
 import shutil
 import subprocess
 import sys
 import time
 
 sys.path.append('/usr/local')  # to import autotest libs.
 from autotest.cros import constants
 from autotest.cros import cryptohome
 
-# TODO(bartfab): Remove when crosbug.com/20709 is fixed.
-sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir))
-from pyauto import AUTO_CLEAR_LOCAL_STATE_MAGIC_FILE
+TEMP_BACKCHANNEL_FILE = '/tmp/pyauto_network_backchannel_file'
 
-TEMP_BACKCHANNEL_FILE = '/tmp/pyauto_network_backchannel_file'
 
 class SuidAction(object):
   """Helper to perform some super-user actions on ChromeOS."""
 
   def _ParseArgs(self):
     parser = optparse.OptionParser()
     parser.add_option(
         '-a', '--action', help='Action to perform.')
     self._options = parser.parse_args()[0]
     if not self._options.action:
@@ skipping 40 matching lines @@
       begin = time.time()
       while not os.path.exists(constants.RESOLV_CONF_FILE):
         if time.time() - begin > 10:
           raise RuntimeError('Timeout while waiting for flimflam/shill start.')
         time.sleep(.25)
 
   def RemoveAllCryptohomeVaults(self):
     """Remove any existing cryptohome vaults."""
     cryptohome.remove_all_vaults()
 
-  def TryToDisableLocalStateAutoClearing(self):
-    """Try to disable clearing of the local state on session manager startup.
-
-    This will fail if rootfs verification is on.
-    TODO(bartfab): Remove this method when crosbug.com/20709 is fixed.
-    """
-    os.system('mount -o remount,rw /')
-    os.remove(AUTO_CLEAR_LOCAL_STATE_MAGIC_FILE)
-    os.system('mount -o remount,ro /')
-    if os.path.exists(AUTO_CLEAR_LOCAL_STATE_MAGIC_FILE):
-      logging.debug('Failed to remove %s. Session manager will clear local '
-                    'state on startup.' % AUTO_CLEAR_LOCAL_STATE_MAGIC_FILE)
-    else:
-      logging.debug('Removed %s. Session manager will not clear local state on '
-                    'startup.' % AUTO_CLEAR_LOCAL_STATE_MAGIC_FILE)
-
-  def TryToEnableLocalStateAutoClearing(self):
-    """Try to enable clearing of the local state on session manager startup.
-
-    This will fail if rootfs verification is on.
-    TODO(bartfab): Remove this method when crosbug.com/20709 is fixed.
-    """
-    os.system('mount -o remount,rw /')
-    open(AUTO_CLEAR_LOCAL_STATE_MAGIC_FILE, 'w').close()
-    os.system('mount -o remount,ro /')
-    if os.path.exists(AUTO_CLEAR_LOCAL_STATE_MAGIC_FILE):
-      logging.debug('Created %s. Session manager will clear local state on '
-                    'startup.' % AUTO_CLEAR_LOCAL_STATE_MAGIC_FILE)
-    else:
-      logging.debug('Failed to create %s. Session manager will not clear local '
-                    'state on startup.' % AUTO_CLEAR_LOCAL_STATE_MAGIC_FILE)
-
   def _GetEthInterfaces(self):
     """Returns a list of the eth* interfaces detected by the device."""
     # Assumes ethernet interfaces all have "eth" in the name.
     import pyudev
     return sorted([iface.sys_name for iface in
                    pyudev.Context().list_devices(subsystem='net')
                    if 'eth' in iface.sys_name])
 
   def _Renameif(self, old_iface, new_iface, mac_address):
     """Renames the interface with mac_address from old_iface to new_iface.
@@ skipping 46 matching lines @@
 
     with open(TEMP_BACKCHANNEL_FILE, 'r') as fp:
       eth_iface, mac_address = fp.read().split(',')
 
     self._Renameif('eth_test', eth_iface, mac_address)
     os.remove(TEMP_BACKCHANNEL_FILE)
 
 
 if __name__ == '__main__':
   sys.exit(SuidAction().Run())