From 26c39878ad8c2e5e673956327badcd6e419488db Mon Sep 17 00:00:00 2001 From: Tianyu Li Date: Fri, 22 Apr 2022 11:22:55 +0800 Subject: tests: fix ipsec sdp cases with parrallel job Serveral IPSec SPD cases re-use the same test class name, leads to test error when do parrallel test with TEST_JOBS=16, change the test class names to unique values. Type: fix Fixes: 7cd35f5d688d9e3bddf66602655274dae944b086 Signed-off-by: Tianyu Li Change-Id: Ia5768654ddb6274531222761cc82b226d97325a9 --- test/test_ipsec_spd_flow_cache_input.py | 10 +++++----- test/test_ipsec_spd_flow_cache_output.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/test_ipsec_spd_flow_cache_input.py b/test/test_ipsec_spd_flow_cache_input.py index 02ecb5625ce..e8c560211bc 100644 --- a/test/test_ipsec_spd_flow_cache_input.py +++ b/test/test_ipsec_spd_flow_cache_input.py @@ -150,7 +150,7 @@ class IPSec4SpdTestCaseDiscard(SpdFlowCacheInbound): self.verify_num_inbound_flow_cache_entries(1) -class IPSec4SpdTestCaseRemove(SpdFlowCacheInbound): +class IPSec4SpdTestCaseRemoveInbound(SpdFlowCacheInbound): """ IPSec/IPv4 inbound: Policy mode test case with flow cache \ (remove bypass)""" @@ -264,7 +264,7 @@ class IPSec4SpdTestCaseRemove(SpdFlowCacheInbound): self.verify_num_inbound_flow_cache_entries(1) -class IPSec4SpdTestCaseReadd(SpdFlowCacheInbound): +class IPSec4SpdTestCaseReaddInbound(SpdFlowCacheInbound): """ IPSec/IPv4 inbound: Policy mode test case with flow cache \ (add, remove, re-add bypass)""" @@ -418,7 +418,7 @@ class IPSec4SpdTestCaseReadd(SpdFlowCacheInbound): self.verify_num_inbound_flow_cache_entries(1) -class IPSec4SpdTestCaseMultiple(SpdFlowCacheInbound): +class IPSec4SpdTestCaseMultipleInbound(SpdFlowCacheInbound): """ IPSec/IPv4 inbound: Policy mode test case with flow cache \ (multiple interfaces, multiple rules)""" @@ -522,7 +522,7 @@ class IPSec4SpdTestCaseMultiple(SpdFlowCacheInbound): self.verify_num_inbound_flow_cache_entries(3) -class IPSec4SpdTestCaseOverwriteStale(SpdFlowCacheInbound): +class IPSec4SpdTestCaseOverwriteStaleInbound(SpdFlowCacheInbound): """ IPSec/IPv4 inbound: Policy mode test case with flow cache \ (overwrite stale entries)""" @@ -700,7 +700,7 @@ class IPSec4SpdTestCaseOverwriteStale(SpdFlowCacheInbound): self.verify_num_inbound_flow_cache_entries(3) -class IPSec4SpdTestCaseCollision(SpdFlowCacheInbound): +class IPSec4SpdTestCaseCollisionInbound(SpdFlowCacheInbound): """ IPSec/IPv4 inbound: Policy mode test case with flow cache \ (hash collision)""" diff --git a/test/test_ipsec_spd_flow_cache_output.py b/test/test_ipsec_spd_flow_cache_output.py index 9852b375a82..8af3b6cfcda 100644 --- a/test/test_ipsec_spd_flow_cache_output.py +++ b/test/test_ipsec_spd_flow_cache_output.py @@ -82,7 +82,7 @@ class IPSec4SpdTestCaseAdd(SpdFlowCacheOutbound): self.verify_num_outbound_flow_cache_entries(1) -class IPSec4SpdTestCaseRemove(SpdFlowCacheOutbound): +class IPSec4SpdTestCaseRemoveOutbound(SpdFlowCacheOutbound): """ IPSec/IPv4 outbound: Policy mode test case with flow cache \ (remove rule)""" @@ -180,7 +180,7 @@ class IPSec4SpdTestCaseRemove(SpdFlowCacheOutbound): self.verify_num_outbound_flow_cache_entries(1) -class IPSec4SpdTestCaseReadd(SpdFlowCacheOutbound): +class IPSec4SpdTestCaseReaddOutbound(SpdFlowCacheOutbound): """ IPSec/IPv4 outbound: Policy mode test case with flow cache \ (add, remove, re-add)""" @@ -322,7 +322,7 @@ class IPSec4SpdTestCaseReadd(SpdFlowCacheOutbound): self.verify_num_outbound_flow_cache_entries(1) -class IPSec4SpdTestCaseMultiple(SpdFlowCacheOutbound): +class IPSec4SpdTestCaseMultipleOutbound(SpdFlowCacheOutbound): """ IPSec/IPv4 outbound: Policy mode test case with flow cache \ (multiple interfaces, multiple rules)""" @@ -460,7 +460,7 @@ class IPSec4SpdTestCaseMultiple(SpdFlowCacheOutbound): self.verify_num_outbound_flow_cache_entries(3) -class IPSec4SpdTestCaseOverwriteStale(SpdFlowCacheOutbound): +class IPSec4SpdTestCaseOverwriteStaleOutbound(SpdFlowCacheOutbound): """ IPSec/IPv4 outbound: Policy mode test case with flow cache \ (overwrite stale entries)""" @@ -638,7 +638,7 @@ class IPSec4SpdTestCaseOverwriteStale(SpdFlowCacheOutbound): self.verify_num_outbound_flow_cache_entries(3) -class IPSec4SpdTestCaseCollision(SpdFlowCacheOutbound): +class IPSec4SpdTestCaseCollisionOutbound(SpdFlowCacheOutbound): """ IPSec/IPv4 outbound: Policy mode test case with flow cache \ (hash collision)""" -- cgit 1.2.3-korg