summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuraj.linkes <juraj.linkes@pantheon.tech>2019-07-08 10:22:55 +0200
committerNeale Ranns <nranns@cisco.com>2019-07-10 08:01:35 +0000
commit1105766b8f75c9e6cd3cbbb38b7557a0d6affc7d (patch)
tree22204cc4e5a1cdaf5bb8f713434505f002c9ee4b
parente4f9556d308ed75b08a2c89925b118e0b7b78abc (diff)
tests: Re-enable ipsec tests on ARM
Type: fix * test_ipsec_tun_if_esp.TestIpsecGreTebIfEsp * test_ipsec_esp.TestIpsecEspAll add keepalive messages before each algo/engine to prevent test timeout Change-Id: I726f3f9613bab02a65e65542cee494c68176ded7 Signed-off-by: juraj.linkes <juraj.linkes@pantheon.tech>
-rw-r--r--test/test_ipsec_esp.py6
-rw-r--r--test/test_ipsec_tun_if_esp.py4
2 files changed, 4 insertions, 6 deletions
diff --git a/test/test_ipsec_esp.py b/test/test_ipsec_esp.py
index 96787716fb4..4da88911016 100644
--- a/test/test_ipsec_esp.py
+++ b/test/test_ipsec_esp.py
@@ -3,7 +3,7 @@ import unittest
from scapy.layers.ipsec import ESP
from scapy.layers.inet import UDP
-from framework import VppTestRunner, is_skip_aarch64_set, is_platform_aarch64
+from framework import VppTestRunner
from template_ipsec import IpsecTra46Tests, IpsecTun46Tests, TemplateIpsec, \
IpsecTcpTests, IpsecTun4Tests, IpsecTra4Tests, config_tra_params, \
IPsecIPv4Params, IPsecIPv6Params, \
@@ -352,8 +352,6 @@ class TestIpsecEspUdp(TemplateIpsecEspUdp, IpsecTra4Tests):
pass
-@unittest.skipIf(is_skip_aarch64_set and is_platform_aarch64,
- "test doesn't work on aarch64")
class TestIpsecEspAll(ConfigIpsecESP,
IpsecTra4, IpsecTra6,
IpsecTun4, IpsecTun6):
@@ -464,6 +462,8 @@ class TestIpsecEspAll(ConfigIpsecESP,
p.salt = algo['salt']
p.flags = p.flags | flag
+ self.reporter.send_keep_alive(self)
+
#
# configure the SPDs. SAs, etc
#
diff --git a/test/test_ipsec_tun_if_esp.py b/test/test_ipsec_tun_if_esp.py
index 1b8aca9b450..20f12497f8d 100644
--- a/test/test_ipsec_tun_if_esp.py
+++ b/test/test_ipsec_tun_if_esp.py
@@ -6,7 +6,7 @@ from scapy.layers.ipsec import ESP
from scapy.layers.l2 import Ether, Raw, GRE
from scapy.layers.inet import IP, UDP
from scapy.layers.inet6 import IPv6
-from framework import VppTestRunner, is_skip_aarch64_set, is_platform_aarch64
+from framework import VppTestRunner
from template_ipsec import TemplateIpsec, IpsecTun4Tests, IpsecTun6Tests, \
IpsecTun4, IpsecTun6, IpsecTcpTests, config_tun_params
from vpp_ipsec_tun_interface import VppIpsecTunInterface
@@ -450,8 +450,6 @@ class TestIpsec6MultiTunIfEsp(TemplateIpsec, IpsecTun6):
self.assertEqual(c['packets'], 127)
-@unittest.skipIf(is_skip_aarch64_set and is_platform_aarch64,
- "test doesn't work on aarch64")
class TestIpsecGreTebIfEsp(TemplateIpsec,
IpsecTun4Tests):
""" Ipsec GRE TEB ESP - TUN tests """