Merge remote branch 'cros/upstream' into tempbranch3

client/bin/partition.py

 """
 APIs to write tests and control files that handle partition creation, deletion
 and formatting.
 
 @copyright: Google 2006-2008
 @author: Martin Bligh (mbligh@google.com)
 """
 
 import os, re, string, sys, fcntl, logging
 from autotest_lib.client.bin import os_dep, utils
@@ skipping 620 matching lines @@
         except:
             if record:
                 self.job.record('FAIL', None, fsck_cmd, error.format_error())
             raise error.TestError('Fsck found errors with the underlying '
                                   'file system')
         else:
             if record:
                 self.job.record('GOOD', None, fsck_cmd)
 
 
-    def mount(self, mountpoint, fstype=None, args='', record=True):
+    def mount(self, mountpoint=None, fstype=None, args='', record=True):
         """
         Mount this partition to a mount point
 
         @param mountpoint: If you have not provided a mountpoint to partition
                 object or want to use a different one, you may specify it here.
         @param fstype: Filesystem type. If not provided partition object value
                 will be used.
         @param args: Arguments to be passed to "mount" command.
         @param record: If True, output result of mount operation to autotest
                 output.
@@ skipping 325 matching lines @@
             os.remove(self.img)
         except:
             e_msg = 'Error removing image file %s' % self.img
             raise error.AutotestError(e_msg)
 
 # import a site partition module to allow it to override functions
 try:
     from autotest_lib.client.bin.site_partition import *
 except ImportError:
     pass