Merge lp:~therve/landscape-client/fix-xen-report into lp:~landscape/landscape-client/trunk

[Thomas Herve]

The branch makes a slightly smarter check by verifying if the devices directory contains files.

[Björn Tillenius (bjornt)]

+1!

[1]

+ def test_get_vm_info_is_empty_without_xen_devices(self):
+ """
+ L{get_vm_info} returns "xen" if the /sys/bus/xen/devices directory
+ exists and contains file.

The docstring doesn't fit what is actually tested.

review: Approve

[lp:~therve/landscape-client/fix-xen-report]

443. By Thomas Herve on 2012-01-30

Fix docstring

[Alberto Donato (ack)]

Good, +1!

review: Approve

=== modified file 'landscape/lib/tests/test_vm_info.py'
--- landscape/lib/tests/test_vm_info.py	2011-06-20 06:42:50 +0000
+++ landscape/lib/tests/test_vm_info.py	2012-01-30 10:07:42 +0000
@@ -64,9 +64,10 @@
 
         self.assertEqual("xen", get_vm_info(root_path=root_path))
 
-    def test_get_vm_info_is_xen_when_sys_bus_xen_exists(self):
+    def test_get_vm_info_is_xen_when_sys_bus_xen_is_non_empty(self):
         """
-        L{get_vm_info} should return 'xen' when /sys/bus/xen exists.
+        L{get_vm_info} should return 'xen' when /sys/bus/xen exists and has
+        devices.
         """
         root_path = self.makeDir()
         sys_path = os.path.join(root_path, "sys")
@@ -76,7 +77,13 @@
         self.makeDir(path=sys_bus_path)
 
         sys_bus_xen_path = os.path.join(sys_bus_path, "xen")
-        self.makeFile(path=sys_bus_xen_path, content="foo")
+        self.makeDir(path=sys_bus_xen_path)
+
+        devices_xen_path = os.path.join(sys_bus_xen_path, "devices")
+        self.makeDir(path=devices_xen_path)
+
+        foo_devices_path = os.path.join(devices_xen_path, "foo")
+        self.makeFile(path=foo_devices_path, content="bar")
 
         self.assertEqual("xen", get_vm_info(root_path=root_path))
 
@@ -130,3 +137,23 @@
         os.makedirs(dmi_path)
         file(os.path.join(dmi_path, "sys_vendor"), "w+").write("VMware, Inc.")
         self.assertEqual("vmware", get_vm_info(root_path=root_path))
+
+    def test_get_vm_info_is_empty_without_xen_devices(self):
+        """
+        L{get_vm_info} returns an empty string if the /sys/bus/xen/devices
+        directory exists and but doesn't contain any file.
+        """
+        root_path = self.makeDir()
+        sys_path = os.path.join(root_path, "sys")
+        self.makeDir(path=sys_path)
+
+        sys_bus_path = os.path.join(sys_path, "bus")
+        self.makeDir(path=sys_bus_path)
+
+        sys_bus_xen_path = os.path.join(sys_bus_path, "xen")
+        self.makeDir(path=sys_bus_xen_path)
+
+        devices_xen_path = os.path.join(sys_bus_xen_path, "devices")
+        self.makeDir(path=devices_xen_path)
+
+        self.assertEqual("", get_vm_info(root_path=root_path))
 
=== modified file 'landscape/lib/vm_info.py'
--- landscape/lib/vm_info.py	2011-06-20 07:41:27 +0000
+++ landscape/lib/vm_info.py	2012-01-30 10:07:42 +0000
@@ -14,7 +14,7 @@
     def join_root_path(path):
         return os.path.join(root_path, path)
 
-    xen_paths = ["proc/sys/xen", "sys/bus/xen", "proc/xen"]
+    xen_paths = ["proc/sys/xen", "proc/xen"]
     xen_paths = map(join_root_path, xen_paths)
 
     vz_path = os.path.join(root_path, "proc/vz")
@@ -24,6 +24,12 @@
     elif filter(os.path.exists, xen_paths):
         return "xen"
 
+    # /sys/bus/xen exists on most machines, but only virtual machines have
+    # devices
+    sys_xen_path = join_root_path("sys/bus/xen/devices")
+    if os.path.isdir(sys_xen_path) and os.listdir(sys_xen_path):
+        return "xen"
+
     cpu_info_path = os.path.join(root_path, "proc/cpuinfo")
     if os.path.exists(cpu_info_path):
         try: