Change in vdsm[ovirt-4.0]: tests: introducting broken_on_ci decorator
gerrit-hooks has posted comments on this change. Change subject: tests: introducting broken_on_ci decorator .. Patch Set 2: * #1374328::Update tracker: OK * Set MODIFIED::bug 1374328#1374328IGNORE, not all related patches are closed, check 63486 -- To view, visit https://gerrit.ovirt.org/63540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I837fe23c9fcd461dc305c4c26cad759f8efa9f94 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: tests: introducting broken_on_ci decorator
Dan Kenigsberg has submitted this change and it was merged. Change subject: tests: introducting broken_on_ci decorator .. tests: introducting broken_on_ci decorator With this decorator we skip failed test only when it was executed on Jenkins. Change-Id: I837fe23c9fcd461dc305c4c26cad759f8efa9f94 Signed-off-by: Petr HoráčekReviewed-on: https://gerrit.ovirt.org/63407 Continuous-Integration: Jenkins CI Reviewed-by: Edward Haas Reviewed-by: Martin Polednik Reviewed-by: Dan Kenigsberg Bug-Url: https://bugzilla.redhat.com/1374328 Reviewed-on: https://gerrit.ovirt.org/63540 Reviewed-by: Irit Goihman --- M automation/check-patch.sh M tests/network/netinfo_test.py M tests/testValidation.py 3 files changed, 23 insertions(+), 2 deletions(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Verified Irit Goihman: Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved Edward Haas: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/63540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I837fe23c9fcd461dc305c4c26cad759f8efa9f94 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: tests: introducting broken_on_ci decorator
Petr Horáček has posted comments on this change. Change subject: tests: introducting broken_on_ci decorator .. Patch Set 1: Verified+1 Exceptions from marked tests were skipped on CI and raised outside Jenkins. -- To view, visit https://gerrit.ovirt.org/63540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I837fe23c9fcd461dc305c4c26cad759f8efa9f94 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: tests: introducting broken_on_ci decorator
Dan Kenigsberg has posted comments on this change. Change subject: tests: introducting broken_on_ci decorator .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/63540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I837fe23c9fcd461dc305c4c26cad759f8efa9f94 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: tests: introducting broken_on_ci decorator
Edward Haas has posted comments on this change. Change subject: tests: introducting broken_on_ci decorator .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/63540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I837fe23c9fcd461dc305c4c26cad759f8efa9f94 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: tests: introducting broken_on_ci decorator
Irit Goihman has posted comments on this change. Change subject: tests: introducting broken_on_ci decorator .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/63540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I837fe23c9fcd461dc305c4c26cad759f8efa9f94 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: tests: introducting broken_on_ci decorator
gerrit-hooks has posted comments on this change. Change subject: tests: introducting broken_on_ci decorator .. Patch Set 1: * #1374328::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1374328::OK, public bug * Check Product::#1374328::OK, Correct classification oVirt * Check TM::#1374328::ERROR, wrong target milestone for stable branch, --- should match ^.*4.0.* * Check merged to previous::OK, change not open on any previous branch -- To view, visit https://gerrit.ovirt.org/63540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I837fe23c9fcd461dc305c4c26cad759f8efa9f94 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: tests: introducting broken_on_ci decorator
Hello Dan Kenigsberg, Martin Polednik, Edward Haas, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/63540 to review the following change. Change subject: tests: introducting broken_on_ci decorator .. tests: introducting broken_on_ci decorator With this decorator we skip failed test only when it was executed on Jenkins. Change-Id: I837fe23c9fcd461dc305c4c26cad759f8efa9f94 Signed-off-by: Petr HoráčekReviewed-on: https://gerrit.ovirt.org/63407 Continuous-Integration: Jenkins CI Reviewed-by: Edward Haas Reviewed-by: Martin Polednik Reviewed-by: Dan Kenigsberg Bug-Url: https://bugzilla.redhat.com/1374328 --- M automation/check-patch.sh M tests/network/netinfo_test.py M tests/testValidation.py 3 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/63540/1 diff --git a/automation/check-patch.sh b/automation/check-patch.sh index 02fc888..91fdd92 100755 --- a/automation/check-patch.sh +++ b/automation/check-patch.sh @@ -4,6 +4,9 @@ set -xe +# This allows us to check whether we are running under Jenkins or not. +export VDSM_AUTOMATION=1 + easy_install pip pip install -U nose==1.3.7 tox==2.1.1 diff --git a/tests/network/netinfo_test.py b/tests/network/netinfo_test.py index f217a65..a09510d 100644 --- a/tests/network/netinfo_test.py +++ b/tests/network/netinfo_test.py @@ -40,7 +40,7 @@ from .nettestlib import dnsmasq_run, dummy_device, veth_pair, wait_for_ipv6 from testlib import VdsmTestCase as TestCaseBase, namedTemporaryDir from testValidation import ValidateRunningAsRoot -from testValidation import brokentest +from testValidation import broken_on_ci # speeds defined in ethtool ETHTOOL_SPEEDS = set([10, 100, 1000, 2500, 1]) @@ -233,7 +233,7 @@ self.assertEqual( misc.getIfaceCfg(deviceName)['NETMASK'], '255.255.0.0') -@brokentest("Skipped becasue it breaks randomly on the CI") +@broken_on_ci(exception=AssertionError) @MonkeyPatch(bonding, 'BONDING_DEFAULTS', bonding.BONDING_DEFAULTS if os.path.exists(bonding.BONDING_DEFAULTS) else '../vdsm/bonding-defaults.json') @@ -408,6 +408,7 @@ self.assertTrue(addresses.is_ipv6(ip_addrs[0])) self.assertTrue(not addresses.is_dynamic(ip_addrs[0])) +@broken_on_ci() @ValidateRunningAsRoot def test_local_auto_with_dynamic_address_from_ra(self): IPV6_NETADDRESS = '2001:1:1:1' diff --git a/tests/testValidation.py b/tests/testValidation.py index 736a9c0..8445dd4 100644 --- a/tests/testValidation.py +++ b/tests/testValidation.py @@ -134,6 +134,23 @@ return wrap +def broken_on_ci(exception=Exception, + msg='Test failed but it is known to be broken on CI'): +def wrap(f): +@wraps(f) +def wrapper(*args, **kwargs): +try: +return f(*args, **kwargs) +except exception: +if os.environ.get('VDSM_AUTOMATION'): +raise SkipTest(msg) +else: +raise +return wrapper + +return wrap + + def stresstest(f): @wraps(f) def wrapper(*args, **kwargs): -- To view, visit https://gerrit.ovirt.org/63540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I837fe23c9fcd461dc305c4c26cad759f8efa9f94 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Martin Polednik ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org