Merge remote branch 'cros/upstream' into tempbranch

client/bin/job.py

 """The main job wrapper
 
 This is the core infrastructure.
 
 Copyright Andy Whitcroft, Martin J. Bligh 2006
 """
 
 import copy, os, platform, re, shutil, sys, time, traceback, types, glob
 import logging, getpass, errno, weakref
 import cPickle as pickle
@@ skipping 645 matching lines @@
         @param subdir: The subdir to use in the job.record call.
         @param running_id: An optional running_id to include in the reboot
             failure log message
 
         @raise JobError: Raised if the current configuration does not match the
             pre-reboot configuration.
         """
         # check to see if any partitions have changed
         partition_list = partition_lib.get_partition_list(self,
                                                           exclude_swap=False)
-        mount_info = set((p.device, p.get_mountpoint()) for p in partition_list)
+        mount_info = partition_lib.get_mount_info(partition_list)
+
         old_mount_info = self._state.get('client', 'mount_info')
         if mount_info != old_mount_info:
             new_entries = mount_info - old_mount_info
             old_entries = old_mount_info - mount_info
             description = ("mounted partitions are different after reboot "
                            "(old entries: %s, new entries: %s)" %
                            (old_entries, new_entries))
             self._record_reboot_failure(subdir, "reboot.verify_config",
                                         description, running_id=running_id)
             raise error.JobError("Reboot failed: %s" % description)
@@ skipping 98 matching lines @@
 
 
     def disable_external_logging(self):
         pass
 
 
     def reboot_setup(self):
         # save the partition list and mount points, as well as the cpu count
         partition_list = partition_lib.get_partition_list(self,
                                                           exclude_swap=False)
-        mount_info = set((p.device, p.get_mountpoint()) for p in partition_list)
+        mount_info = partition_lib.get_mount_info(partition_list)
         self._state.set('client', 'mount_info', mount_info)
         self._state.set('client', 'cpu_count', utils.count_cpus())
 
 
     def reboot(self, tag=LAST_BOOT_TAG):
         if tag == LAST_BOOT_TAG:
             tag = self.last_boot_tag
         else:
             self.last_boot_tag = tag
 
@@ skipping 414 matching lines @@
     assert myjob._record_indent == 0
 
     myjob.complete(0)
 
 
 site_job = utils.import_site_class(
     __file__, "autotest_lib.client.bin.site_job", "site_job", base_client_job)
 
 class job(site_job):
     pass