Merge lp:~pwlars/lava-test/bug640251 into lp:lava-test/0.0

[Paul Larson]

Fix for bug 640251. James, this should fix the tracebacks you were getting in chroots.

[James Westby (james-w)]

Looks good.

Thanks,

James

review: Approve

=== modified file 'abrek/hwprofile.py'
--- abrek/hwprofile.py	2010-08-18 15:33:32 +0000
+++ abrek/hwprofile.py	2010-09-18 04:31:00 +0000
@@ -16,6 +16,7 @@
 import commands
 import os
 import re
+import sys
 from utils import read_file
 
 INTEL_KEYMAP = {
@@ -79,23 +80,26 @@
     elif machine.startswith('arm'):
         keymap, valmap = ARM_KEYMAP, ARM_VALMAP
 
-    cpuinfo = read_file("/proc/cpuinfo")
-    for line in cpuinfo.splitlines():
-        match = pattern.match(line)
-        if match:
-            key, value = match.groups()
-            key, value = _translate_cpuinfo(keymap, valmap,
-                         key, value)
-            if cpudevs[cpunum].get(key):
-                cpunum += 1
-                cpudevs.append({})
-            cpudevs[cpunum][key] = value
-    for c in range(len(cpudevs)):
-        device = {}
-        device['device_type'] = 'device.cpu'
-        device['attributes'] = 'Processor #{0}'.format(c)
-        device['desc'] = cpudevs[c]
-        devices.append(device)
+    try:
+        cpuinfo = read_file("/proc/cpuinfo")
+        for line in cpuinfo.splitlines():
+            match = pattern.match(line)
+            if match:
+                key, value = match.groups()
+                key, value = _translate_cpuinfo(keymap, valmap,
+                    key, value)
+                if cpudevs[cpunum].get(key):
+                    cpunum += 1
+                    cpudevs.append({})
+                cpudevs[cpunum][key] = value
+        for c in range(len(cpudevs)):
+            device = {}
+            device['device_type'] = 'device.cpu'
+            device['attributes'] = 'Processor #{0}'.format(c)
+            device['desc'] = cpudevs[c]
+            devices.append(device)
+    except IOError:
+        print >> sys.stderr, "WARNING: Could not read cpu information"
     return devices
 
 
@@ -108,24 +112,32 @@
     device = {}
     machine = os.uname()[-1]
     if machine in ('i686', 'x86_64'):
-        name = read_file('/sys/class/dmi/id/board_name') or None
-        vendor = read_file('/sys/class/dmi/id/board_vendor') or None
-        version = read_file('/sys/class/dmi/id/board_version') or None
-        if name:
-            device['attributes'] = name.strip()
-        if vendor:
-            desc['vendor'] = vendor.strip()
-        if version:
-            desc['version'] = version.strip()
+        try:
+            name = read_file('/sys/class/dmi/id/board_name') or None
+            vendor = read_file('/sys/class/dmi/id/board_vendor') or None
+            version = read_file('/sys/class/dmi/id/board_version') or None
+            if name:
+                device['attributes'] = name.strip()
+            if vendor:
+                desc['vendor'] = vendor.strip()
+            if version:
+                desc['version'] = version.strip()
+        except IOError:
+            print >> sys.stderr, "WARNING: Could not read board information"
+            return devices
     elif machine.startswith('arm'):
-        cpuinfo = read_file("/proc/cpuinfo")
-        if cpuinfo is None:
-            return devices
-        pattern = re.compile("^Hardware\s*:\s*(?P<hardware>.+)$", re.M)
-        match = pattern.search(cpuinfo)
-        if match is None:
-            return devices
-        desc['hardware'] = match.group('hardware')
+        try:
+            cpuinfo = read_file("/proc/cpuinfo")
+            if cpuinfo is None:
+                return devices
+            pattern = re.compile("^Hardware\s*:\s*(?P<hardware>.+)$", re.M)
+            match = pattern.search(cpuinfo)
+            if match is None:
+                return devices
+            desc['hardware'] = match.group('hardware')
+        except IOError:
+            print >> sys.stderr, "WARNING: Could not read board information"
+            return devices
     else:
         return devices
     device['desc'] = desc
@@ -141,25 +153,28 @@
     pattern = re.compile('^(?P<key>.+?)\s*:\s*(?P<value>.+) kB$', re.M)
 
     devices = []
-    meminfo = read_file("/proc/meminfo")
-    for match in pattern.finditer(meminfo):
-        key, value = match.groups()
-        if key not in ('MemTotal', 'SwapTotal'):
-            continue
-        capacity = int(value) << 10 #Kernel reports in 2^10 units
-        if capacity == 0:
-            continue
-        if key == 'MemTotal':
-            kind = 'RAM'
-        else:
-            kind = 'swap'
-        name = "{capacity}MiB of {kind}".format(
-               capacity=capacity >> 20, kind=kind)
-        device = {}
-        device['attributes'] = name
-        device['desc'] = {'capacity': capacity, 'kind': kind}
-        device['device_type'] = "device.mem"
-        devices.append(device)
+    try:
+        meminfo = read_file("/proc/meminfo")
+        for match in pattern.finditer(meminfo):
+            key, value = match.groups()
+            if key not in ('MemTotal', 'SwapTotal'):
+                continue
+            capacity = int(value) << 10 #Kernel reports in 2^10 units
+            if capacity == 0:
+                continue
+            if key == 'MemTotal':
+                kind = 'RAM'
+            else:
+                kind = 'swap'
+            name = "{capacity}MiB of {kind}".format(
+                capacity=capacity >> 20, kind=kind)
+            device = {}
+            device['attributes'] = name
+            device['desc'] = {'capacity': capacity, 'kind': kind}
+            device['device_type'] = "device.mem"
+            devices.append(device)
+    except IOError:
+        print >> sys.stderr, "WARNING: Could not read memory information"
     return devices
 
 def get_usb_devs():

=== modified file 'abrek/utils.py'
--- abrek/utils.py	2010-09-15 03:38:49 +0000
+++ abrek/utils.py	2010-09-18 04:31:00 +0000
@@ -19,6 +19,7 @@
 import urlparse
 
 _fake_files = None
+_fake_paths = None
 
 def geturl(url, path=""):
     urlpath = urlparse.urlsplit(url).path
@@ -42,18 +43,37 @@
 
 def read_file(path):
     global _fake_files
+    global _fake_paths
     if _fake_files is not None:
         if path in _fake_files:
             return _fake_files[path]
+    if _fake_paths is not None:
+        if path in _fake_paths:
+            path = _fake_paths[path]
     with open(path) as fd:
         data = fd.read()
     return data
 
-def fake_file(path, data):
+def fake_file(path, data=None, newpath=None):
     """
     Set up a fake file to be read with read_file() in testing
+    If data is specified, the string passed as data will be returned instead
+    if newpath is specified, the file attempted to be read will be replaced
+    by newfile
     """
     global _fake_files
-    if _fake_files is None:
-        _fake_files = {}
-    _fake_files[path] = data
+    global _fake_paths
+    if data is not None:
+        if _fake_files is None:
+            _fake_files = {}
+        _fake_files[path] = data
+    if newpath is not None:
+        if _fake_paths is None:
+            _fake_paths = {}
+        _fake_paths[path] = newpath
+
+def clear_fakes():
+    global _fake_files
+    global _fake_paths
+    _fake_files = {}
+    _fake_paths = {}

=== modified file 'tests/test_hwprofile.py'
--- tests/test_hwprofile.py	2010-09-10 17:09:14 +0000
+++ tests/test_hwprofile.py	2010-09-18 04:31:00 +0000
@@ -13,10 +13,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
 import unittest
 
 import abrek.hwprofile
-from abrek.utils import fake_file
+from abrek.utils import fake_file, clear_fakes
+from imposters import OutputImposter
+from fixtures import TestCaseWithFixtures
 
 
 class AptCache:
@@ -92,3 +95,38 @@
     def test_get_usb_devs(self):
         devs = abrek.hwprofile.get_usb_devs()
         self.assertEqual('device.usb', devs[0]['device_type'])
+
+
+class MissingFiles(TestCaseWithFixtures):
+    """
+    These are tests for situations where certain files used for gathering
+    hardware profile information may be missing
+    """
+    def setUp(self):
+        super(MissingFiles, self).setUp()
+        clear_fakes()
+        self.out = self.add_fixture(OutputImposter())
+
+    def test_bad_cpuinfo(self):
+        errmsg = "WARNING: Could not read cpu information\n"
+        fake_file('/proc/cpuinfo', newpath='/foo/bar')
+        devs = abrek.hwprofile.get_cpu_devs()
+        self.assertEqual([], devs)
+        self.assertEqual(errmsg, self.out.getvalue())
+
+    def test_bad_boardinfo(self):
+        machine = os.uname()[-1]
+        errmsg = "WARNING: Could not read board information\n"
+        fake_file('/sys/class/dmi/id/board_name', newpath='/foo/bar')
+        devs = abrek.hwprofile.get_board_devs()
+        self.assertEqual([], devs)
+        if machine in ('i686', 'x86_64'):
+            self.assertEqual(errmsg, self.out.getvalue())
+
+    def test_bad_meminfo(self):
+        errmsg = "WARNING: Could not read memory information\n"
+        fake_file('/proc/meminfo', newpath='/foo/bar')
+        devs = abrek.hwprofile.get_mem_devs()
+        self.assertEqual([], devs)
+        self.assertEqual(errmsg, self.out.getvalue())
+

=== modified file 'tests/test_main.py'
--- tests/test_main.py	2010-09-15 20:28:14 +0000
+++ tests/test_main.py	2010-09-18 04:31:00 +0000
@@ -22,7 +22,6 @@
     def setUp(self):
         super(testMain, self).setUp()
         self.out = self.add_fixture(OutputImposter())
-        self._fixtures = []
 
     def test_bad_subcmd(self):
         errmsg = "Unknown usage './abrek results foo'\nUse 'abrek help [cmd]' for help\n"