[PATCH] [TEST] Fix to stick to 80 columns rule in two lines
# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1231828694 28800 # Node ID 0c7c27ad9c6db00d9f6d0ac6b8249b05093aea74 # Parent 43bf01b82ce9f627af1b5db55922b0584cd0e3b4 [TEST] Fix to stick to 80 columns rule in two lines Signed-off-by: Guolian Yun<yunguol@cn.ibm.com> diff -r 43bf01b82ce9 -r 0c7c27ad9c6d suites/libvirt-cim/cimtest/RASD/05_disk_rasd_emu_type.py --- a/suites/libvirt-cim/cimtest/RASD/05_disk_rasd_emu_type.py Mon Jan 12 08:22:47 2009 -0800 +++ b/suites/libvirt-cim/cimtest/RASD/05_disk_rasd_emu_type.py Mon Jan 12 22:38:14 2009 -0800 @@ -52,12 +52,13 @@ logger.error("Failed to call DefineSystem()") return FAIL - drasd= get_typed_class(options.virt,'DiskResourceAllocationSettingData') + drasd= get_typed_class(options.virt, + 'DiskResourceAllocationSettingData') drasd_list = EnumInstances(options.ip, drasd, ret_cim_inst=True) if len(drasd_list) < 1: - raise Exception("%s returned %i instances, expected at least 1" \ - %(drasd, len(drasd_list))) + raise Exception("%s returned %i instances, expected at least 1"\ + %(drasd, len(drasd_list))) found_rasd = None for rasd in drasd_list:
You need to do these changes on top of "#2 Update RASD-05_disk_rasd_emu_type.py to support Xen, skip adding CDROM devices while emu_type=1" or else kaitlin needs to add this before she applies "#2 Update RASD-05_disk_rasd_emu_type.py to support Xen, skip adding CDROM devices while emu_type=1" patch to the tree. +1 for these changes. yunguol@cn.ibm.com wrote:
# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1231828694 28800 # Node ID 0c7c27ad9c6db00d9f6d0ac6b8249b05093aea74 # Parent 43bf01b82ce9f627af1b5db55922b0584cd0e3b4 [TEST] Fix to stick to 80 columns rule in two lines
Signed-off-by: Guolian Yun<yunguol@cn.ibm.com>
diff -r 43bf01b82ce9 -r 0c7c27ad9c6d suites/libvirt-cim/cimtest/RASD/05_disk_rasd_emu_type.py --- a/suites/libvirt-cim/cimtest/RASD/05_disk_rasd_emu_type.py Mon Jan 12 08:22:47 2009 -0800 +++ b/suites/libvirt-cim/cimtest/RASD/05_disk_rasd_emu_type.py Mon Jan 12 22:38:14 2009 -0800 @@ -52,12 +52,13 @@ logger.error("Failed to call DefineSystem()") return FAIL
- drasd= get_typed_class(options.virt,'DiskResourceAllocationSettingData') + drasd= get_typed_class(options.virt, + 'DiskResourceAllocationSettingData')
drasd_list = EnumInstances(options.ip, drasd, ret_cim_inst=True) if len(drasd_list) < 1: - raise Exception("%s returned %i instances, expected at least 1" \ - %(drasd, len(drasd_list))) + raise Exception("%s returned %i instances, expected at least 1"\ + %(drasd, len(drasd_list)))
found_rasd = None for rasd in drasd_list:
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
-- Thanks and Regards, Deepti B. Kalakeri IBM Linux Technology Center deeptik@linux.vnet.ibm.com
Deepti B Kalakeri wrote:
You need to do these changes on top of "#2 Update RASD-05_disk_rasd_emu_type.py to support Xen, skip adding CDROM devices while emu_type=1" or else kaitlin needs to add this before she applies "#2 Update RASD-05_disk_rasd_emu_type.py to support Xen, skip adding CDROM devices while emu_type=1" patch to the tree.
I agree. In these kinds of cases, the patch is generally resent to include the new changes instead of generating a second patch. There can be exceptions if a patch is particularly long or if it easier to read if it is broken up. However, both patches looked good to me and both are applied. -- Kaitlin Rupert IBM Linux Technology Center kaitlin@linux.vnet.ibm.com
libvirt-cim-bounces@redhat.com wrote on 2009-01-14 04:53:32:
Deepti B Kalakeri wrote:
You need to do these changes on top of "#2 Update RASD-05_disk_rasd_emu_type.py to support Xen, skip adding CDROM devices while emu_type=1" or else kaitlin needs to add this before she applies "#2 Update RASD-05_disk_rasd_emu_type.py to support Xen, skip adding CDROM devices while emu_type=1" patch to the tree.
I agree. In these kinds of cases, the patch is generally resent to include the new changes instead of generating a second patch.
There can be exceptions if a patch is particularly long or if it easier to read if it is broken up.
However, both patches looked good to me and both are applied.
Thanks! I will merge those two patches and resent in these kinds of cases next time.
-- Kaitlin Rupert IBM Linux Technology Center kaitlin@linux.vnet.ibm.com
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
participants (4)
-
Deepti B Kalakeri -
Guo Lian Yun -
Kaitlin Rupert -
yunguol＠cn.ibm.com