Mark Wu has uploaded a new change for review.
Change subject: Revert "tests: Fix parted_utils_tests break on fedora 18" ......................................................................
Revert "tests: Fix parted_utils_tests break on fedora 18"
The commit 51d76e caused a break on rhel6 host because of a bug in parted.version(). Please see: https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=700383 It's fixed in Fedora 14, but not backported to RHEL6. So we have to find a workaround for the break on Fedora18.
This reverts commit 51d76e04727c2d41371eb207f02a0f84de74a140.
Change-Id: I723edbeb1fc18c0160f4cfd7d1d808fd92acf125 Signed-off-by: Mark Wu wudxw@linux.vnet.ibm.com --- M tests/parted_utils_tests.py 1 file changed, 2 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/11136/1
diff --git a/tests/parted_utils_tests.py b/tests/parted_utils_tests.py index b796077..808d748 100644 --- a/tests/parted_utils_tests.py +++ b/tests/parted_utils_tests.py @@ -21,7 +21,6 @@ import tempfile import os import time -from distutils.version import StrictVersion
import testValidation from testrunner import VdsmTestCase as TestCaseBase @@ -40,14 +39,6 @@ PART_SIZE_MB = 50 FREE_SIZE = 50 * ONE_MB_IN_BYTES PART_END_SIZE = 47 * ONE_MB_IN_BYTES - -# parted 3.1 improves its support for loopback devices. The 'model' string -# returned by libparted is updated to 'Loopback device' -parted_version = StrictVersion(putils.parted.version()['libparted']) -if parted_version >= StrictVersion('3.1'): - LOOP_DEVICE_MODEL = 'Loopback device' -else: - LOOP_DEVICE_MODEL = ''
class PartedUtilsTests(TestCaseBase): @@ -88,7 +79,7 @@
def _blank_dev_test(self): info = putils.getDevicePartedInfo(self.devPath) - self.assertEquals(info['model'], LOOP_DEVICE_MODEL) + self.assertFalse(info['model']) self.assertTrue(info['sectorSize'] >= 0) self.assertFalse(info['type']) self.assertFalse(info['partitions']) @@ -108,7 +99,7 @@ time.sleep(1) # wait for syncing
info = putils.getDevicePartedInfo(self.devPath) - self.assertEquals(info['model'], LOOP_DEVICE_MODEL) + self.assertFalse(info['model']) self.assertTrue(info['sectorSize'] >= 0) self.assertEquals(info['type'], 'gpt') self.assertTrue(info['freeSpaceRegions'][0][3] >= FREE_SIZE)
-- To view, visit http://gerrit.ovirt.org/11136 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: I723edbeb1fc18c0160f4cfd7d1d808fd92acf125 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wudxw@linux.vnet.ibm.com
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Revert "tests: Fix parted_utils_tests break on fedora 18" ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/802/ (1/2)
-- To view, visit http://gerrit.ovirt.org/11136 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I723edbeb1fc18c0160f4cfd7d1d808fd92acf125 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Revert "tests: Fix parted_utils_tests break on fedora 18" ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/767/ (2/2)
-- To view, visit http://gerrit.ovirt.org/11136 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I723edbeb1fc18c0160f4cfd7d1d808fd92acf125 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Revert "tests: Fix parted_utils_tests break on fedora 18" ......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/767/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/802/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/11136 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I723edbeb1fc18c0160f4cfd7d1d808fd92acf125 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Antoni Segura Puimedon has posted comments on this change.
Change subject: Revert "tests: Fix parted_utils_tests break on fedora 18" ......................................................................
Patch Set 1: Verified; Looks good to me, but someone else must approve
Fixies my build problems on rhel 6.4
-- To view, visit http://gerrit.ovirt.org/11136 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I723edbeb1fc18c0160f4cfd7d1d808fd92acf125 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: Revert "tests: Fix parted_utils_tests break on fedora 18" ......................................................................
Patch Set 1: I would prefer that you didn't submit this
(1 inline comment)
.................................................... File tests/parted_utils_tests.py Line 78: self.assertFalse(putils.getDevicePartedInfo('/dev/abcdef')) Line 79: Line 80: def _blank_dev_test(self): Line 81: info = putils.getDevicePartedInfo(self.devPath) Line 82: self.assertFalse(info['model']) haven't we agreed to drop this assertion, too, so the test works for F18, too? Line 83: self.assertTrue(info['sectorSize'] >= 0) Line 84: self.assertFalse(info['type']) Line 85: self.assertFalse(info['partitions']) Line 86: self.assertFalse(info['freeSpaceRegions'])
-- To view, visit http://gerrit.ovirt.org/11136 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I723edbeb1fc18c0160f4cfd7d1d808fd92acf125 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Revert "tests: Fix parted_utils_tests break on fedora 18" ......................................................................
Revert "tests: Fix parted_utils_tests break on fedora 18"
The commit 51d76e caused a break on rhel6 host because of a bug in parted.version(). Please see: https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=700383 It's fixed in Fedora 14, but not backported to RHEL6. So we have to find a workaround for the break on Fedora18.
This reverts commit 51d76e04727c2d41371eb207f02a0f84de74a140.
Change-Id: I723edbeb1fc18c0160f4cfd7d1d808fd92acf125 Signed-off-by: Mark Wu wudxw@linux.vnet.ibm.com --- M tests/parted_utils_tests.py 1 file changed, 2 insertions(+), 11 deletions(-)
Approvals: Antoni Segura Puimedon: Verified; Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/11136 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged Gerrit-Change-Id: I723edbeb1fc18c0160f4cfd7d1d808fd92acf125 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: Revert "tests: Fix parted_utils_tests break on fedora 18" ......................................................................
Patch Set 1: Looks good to me, approved
ah, only now have I seen the following patch.
-- To view, visit http://gerrit.ovirt.org/11136 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I723edbeb1fc18c0160f4cfd7d1d808fd92acf125 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
vdsm-patches@lists.fedorahosted.org