Change in vdsm[master]: networkTests: delete our lease files also on EL6
automat...@ovirt.org has posted comments on this change. Change subject: networkTests: delete our lease files also on EL6 .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit http://gerrit.ovirt.org/37684 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: networkTests: delete our lease files also on EL6
automat...@ovirt.org has posted comments on this change. Change subject: networkTests: delete our lease files also on EL6 .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit http://gerrit.ovirt.org/37684 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Petr Horáček phora...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: networkTests: delete our lease files also on EL6
automat...@ovirt.org has posted comments on this change. Change subject: networkTests: delete our lease files also on EL6 .. Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit http://gerrit.ovirt.org/37684 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Petr Horáček phora...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: networkTests: delete our lease files also on EL6
Dan Kenigsberg has submitted this change and it was merged. Change subject: networkTests: delete our lease files also on EL6 .. networkTests: delete our lease files also on EL6 EL6's initscripts name them with one less dash and the extension *.leases, unlike recent ones (*.lease). (Inside the two dashes there may be a UUID if set in an ifcfg file.) dhclient--veth_wjG7pxZqwg.lease (EL7), dhclient-veth_wjG7pxZqwg.leases (EL6) Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a Signed-off-by: Ondřej Svoboda osvob...@redhat.com Reviewed-on: http://gerrit.ovirt.org/37684 Reviewed-by: Ido Barkan ibar...@redhat.com Reviewed-by: Dan Kenigsberg dan...@redhat.com --- M tests/functional/dhcp.py M tests/functional/networkTests.py 2 files changed, 13 insertions(+), 7 deletions(-) Approvals: Ido Barkan: Looks good to me, but someone else must approve Ondřej Svoboda: Verified Dan Kenigsberg: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/37684 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Petr Horáček phora...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: networkTests: delete our lease files also on EL6
oVirt Jenkins CI Server has posted comments on this change. Change subject: networkTests: delete our lease files also on EL6 .. Patch Set 3: Build Failed http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/642/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc21-x86_64_merged/241/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4625/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/618/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-el6-x86_64_merged/245/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/643/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-el7-x86_64_merged/245/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc20-x86_64_merged/232/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/639/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/6464/ : FAILURE -- To view, visit http://gerrit.ovirt.org/37684 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Petr Horáček phora...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: networkTests: delete our lease files also on EL6
Dan Kenigsberg has posted comments on this change. Change subject: networkTests: delete our lease files also on EL6 .. Patch Set 2: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/37684 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Petr Horáček phora...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: networkTests: delete our lease files also on EL6
oVirt Jenkins CI Server has posted comments on this change. Change subject: networkTests: delete our lease files also on EL6 .. Patch Set 2: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/15585/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/14783/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/15754/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/2627/ : There was an infra issue, please contact in...@ovirt.org http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created_staging/561/ : FAILURE -- To view, visit http://gerrit.ovirt.org/37684 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Petr Horáček phora...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: networkTests: delete our lease files also on EL6
Ondřej Svoboda has posted comments on this change. Change subject: networkTests: delete our lease files also on EL6 .. Patch Set 2: Verified+1 There are no leftover leases even on EL6. not related to the verification: I only noticed that testSetupNetworksReconfigureBridge shows a warning although it succeeds: WARNING:root:File: /var/lib/dhclient/dhclient-test-network.leases already removed I think that the try-finally block in the test can be simplified – it just needs to wrap setup_test_network(dhcp=True), only one such call. -- To view, visit http://gerrit.ovirt.org/37684 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Petr Horáček phora...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: networkTests: delete our lease files also on EL6
Ido Barkan has posted comments on this change. Change subject: networkTests: delete our lease files also on EL6 .. Patch Set 2: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/37684 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Petr Horáček phora...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: networkTests: delete our lease files also on EL6
Ondřej Svoboda has uploaded a new change for review.
Change subject: networkTests: delete our lease files also on EL6
..
networkTests: delete our lease files also on EL6
EL6's initscripts name the leases with one less dash than more recent ones.
(Inside the two dashes there may be a UUID if set in an ifcfg file.)
dhclient--veth_wjG7pxZqwg.lease (EL7), dhclient--veth_wjG7pxZqwg.lease (EL6)
Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a
Signed-off-by: Ondřej Svoboda osvob...@redhat.com
---
M tests/functional/dhcp.py
M tests/functional/networkTests.py
2 files changed, 13 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/84/37684/1
diff --git a/tests/functional/dhcp.py b/tests/functional/dhcp.py
index 47dacf3..2545fd7 100644
--- a/tests/functional/dhcp.py
+++ b/tests/functional/dhcp.py
@@ -33,7 +33,7 @@
_START_CHECK_TIMEOUT = 0.5
_DHCLIENT_TIMEOUT = 10
_WAIT_FOR_STOP_TIMEOUT = 2
-DHCLIENT_LEASE = '/var/lib/dhclient/dhclient{0}--{1}.lease'
+DHCLIENT_LEASE = '/var/lib/dhclient/dhclient{0}-{1}{2}.lease'
class DhcpError(Exception):
@@ -156,8 +156,9 @@
return executable == _DHCLIENT_BINARY.cmd
-def delete_dhclient_leases(iface, dhcpv4=False, dhcpv6=False):
+def delete_dhclient_leases(iface, dhcpv4=False, dhcpv6=False, el6=False):
+dash = '' if el6 else '-'
if dhcpv4:
-rmFile(DHCLIENT_LEASE.format('', iface))
+rmFile(DHCLIENT_LEASE.format('', dash, iface))
if dhcpv6:
-rmFile(DHCLIENT_LEASE.format('6', iface))
+rmFile(DHCLIENT_LEASE.format('6', dash, iface))
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 1e61931..73509ca 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -1810,7 +1810,8 @@
self.assertRuleDoesNotExist(rule)
finally:
dhcp.delete_dhclient_leases(
-NETWORK_NAME if bridged else right, dhcpv4, dhcpv6)
+NETWORK_NAME if bridged else right, dhcpv4, dhcpv6,
+el6)
@cleanupNet
@RequireVethMod
@@ -1846,13 +1847,16 @@
with veth.pair() as (left, right):
veth.setIP(left, IP_ADDRESS, IP_CIDR)
veth.setLinkUp(left)
-with dnsmasqDhcp(left, _system_is_el6()):
+el6 = _system_is_el6()
+with dnsmasqDhcp(left, el6):
try:
setup_test_network(dhcp=True)
-dhcp.delete_dhclient_leases(NETWORK_NAME, dhcpv4=True)
+dhcp.delete_dhclient_leases(NETWORK_NAME, dhcpv4=True,
+el6=el6)
setup_test_network(dhcp=False)
finally:
-dhcp.delete_dhclient_leases(NETWORK_NAME, dhcpv4=True)
+dhcp.delete_dhclient_leases(NETWORK_NAME, dhcpv4=True,
+el6=el6)
@permutations([[(4, 'default')], [(4, 'local')], [(6, None)]])
@cleanupNet
--
To view, visit http://gerrit.ovirt.org/37684
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: networkTests: delete our lease files also on EL6
oVirt Jenkins CI Server has posted comments on this change. Change subject: networkTests: delete our lease files also on EL6 .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/15550/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/14748/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/15719/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/2622/ : There was an infra issue, please contact in...@ovirt.org http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created_staging/526/ : FAILURE -- To view, visit http://gerrit.ovirt.org/37684 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibe9bd81c33aade9baf72c54f25a802f80a36de5a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
