Merge remote branch 'autotest-upstream/master' into try-box1

client/common_lib/hosts/base_classes.py

 # Copyright 2009 Google Inc. Released under the GPL v2
 
 """
 This module defines the base classes for the Host hierarchy.
 
 Implementation details:
 You should import the "hosts" package instead of importing each type of host.
 
         Host: a machine on which you can run programs
 """
@@ skipping 210 matching lines @@
 
     def verify_connectivity(self):
         pass
 
 
     def verify_software(self):
         pass
 
 
     def check_diskspace(self, path, gb):
-        # Note: 1 GB = 10**9 bytes (SI unit).
+        """Raises an error if path does not have at least gb GB free.
+
+        @param path The path to check for free disk space.
+        @param gb A floating point number to compare with a granularity
+            of 1 MB.
+
+        1000 based SI units are used.
+
+        @raises AutoservDiskFullHostError if path has less than gb GB free.
+        """
+        one_mb = 10**6  # Bytes (SI unit).
+        mb_per_gb = 1000.0
         logging.info('Checking for >= %s GB of space under %s on machine %s',
                      gb, path, self.hostname)
-        df = self.run('df -PB %d %s | tail -1' % (10**9, path)).stdout.split()
-        free_space_gb = int(df[3])
+        df = self.run('df -PB %d %s | tail -1' % (one_mb, path)).stdout.split()
+        free_space_gb = int(df[3])/mb_per_gb
         if free_space_gb < gb:
             raise error.AutoservDiskFullHostError(path, gb, free_space_gb)
         else:
             logging.info('Found %s GB >= %s GB of space under %s on machine %s',
                 free_space_gb, gb, path, self.hostname)
 
 
     def get_open_func(self, use_cache=True):
         """
         Defines and returns a function that may be used instead of built-in
@@ skipping 443 matching lines @@
 
         # remove all the vmlinux and System.map files left over
         for f in (unused_vmlinux | unused_system_map):
             self.run('rm -f', args=(f,),
                      ignore_status=True, timeout=120)
 
         # remove all unused module directories
         # the regex match should keep us safe from removing the wrong files
         for moddir in unused_moddirs:
             self.run('rm -fr', args=(moddir,), ignore_status=True)