Dan Kenigsberg has uploaded a new change for review.

Change subject: net tests: wait for a concurrent iptables call to finish
......................................................................

net tests: wait for a concurrent iptables call to finish

test_local_auto_with_dynamic_address_from_ra may execute in parallel on
the same machine. This patch waits until a concurrent iptables call
finishes instead of failing immediately.

The down side is that a waiting test may starve forever, but I do not
believe it is a real problem, as iptables executions are rare and short.

Change-Id: Ib95f679558dd0553b24fb16589beac76991f89bf
Signed-off-by: Dan Kenigsberg <[email protected]>
---
M tests/network/firewall.py
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/55904/1

diff --git a/tests/network/firewall.py b/tests/network/firewall.py
index ac39864..a02ffbc 100644
--- a/tests/network/firewall.py
+++ b/tests/network/firewall.py
@@ -54,10 +54,12 @@
     """
     try:
         if _serviceRunning('iptables'):
-            _execCmdChecker([_IPTABLES_BINARY.cmd, '-I', 'INPUT', '-i',
+            _execCmdChecker([_IPTABLES_BINARY.cmd, '--wait',
+                            '-I', 'INPUT', '-i',
                             iface, '-p', 'udp', '--sport', '68', '--dport',
                             '67', '-j', 'ACCEPT'])  # DHCPv4
-            _execCmdChecker([_IPTABLES_BINARY.cmd, '-I', 'INPUT', '-i',
+            _execCmdChecker([_IPTABLES_BINARY.cmd, '--wait',
+                            '-I', 'INPUT', '-i',
                             iface, '-p', 'udp', '--sport', '546', '--dport',
                             '547', '-j', 'ACCEPT'])  # DHCPv6
         elif _serviceRunning('firewalld'):


-- 
To view, visit https://gerrit.ovirt.org/55904
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib95f679558dd0553b24fb16589beac76991f89bf
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Reply via email to