Merge lp:~therve/landscape-client/fix-xen-report into lp:~landscape/landscape-client/trunk
Proposed by
Thomas Herve
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Alberto Donato | ||||
Approved revision: | 443 | ||||
Merged at revision: | 443 | ||||
Proposed branch: | lp:~therve/landscape-client/fix-xen-report | ||||
Merge into: | lp:~landscape/landscape-client/trunk | ||||
Diff against target: |
81 lines (+37/-4) 2 files modified
landscape/lib/tests/test_vm_info.py (+30/-3) landscape/lib/vm_info.py (+7/-1) |
||||
To merge this branch: | bzr merge lp:~therve/landscape-client/fix-xen-report | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alberto Donato (community) | Approve | ||
Björn Tillenius (community) | Approve | ||
Review via email: mp+90663@code.launchpad.net |
Description of the change
The branch makes a slightly smarter check by verifying if the devices directory contains files.
To post a comment you must log in.
+1!
[1]
+ def test_get_ vm_info_ is_empty_ without_ xen_devices( self): xen/devices directory
+ """
+ L{get_vm_info} returns "xen" if the /sys/bus/
+ exists and contains file.
The docstring doesn't fit what is actually tested.