From a43c93f8554ad7418e31be3791b3fb71232f60ac Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Thu, 22 Aug 2019 00:32:29 +0000 Subject: [PATCH] tests: move plugin tests to src/plugins/*/test - Relocate plugin tests for 'make test' into src/plugins/*/test so that plugin test cases are co-located with the plugin source code. Type: refactor Signed-off-by: Dave Wallace Change-Id: I503e6a43528e14981799b735fa65674155713f67 Signed-off-by: Dave Wallace --- {test => src/plugins/abf/test}/test_abf.py | 0 {test => src/plugins/acl/test}/test_acl_plugin.py | 0 {test => src/plugins/acl/test}/test_acl_plugin_conns.py | 0 {test => src/plugins/acl/test}/test_acl_plugin_l2l3.py | 0 {test => src/plugins/acl/test}/test_acl_plugin_macip.py | 0 {test => src/plugins/acl/test}/test_classify_l2_acl.py | 0 {test => src/plugins/cdp/test}/test_cdp.py | 0 {test => src/plugins/flowprobe/test}/test_flowprobe.py | 0 {test => src/plugins/gbp/test}/test_gbp.py | 0 {test => src/plugins/gtpu/test}/test_gtpu.py | 0 {test => src/plugins/igmp/test}/test_igmp.py | 0 {test => src/plugins/igmp/test}/vpp_igmp.py | 0 {test => src/plugins/l3xc/test}/test_l3xc.py | 0 {test => src/plugins/lb/test}/test_lb.py | 0 {test => src/plugins/lb/test}/test_lb_api.py | 0 {test => src/plugins/lb/test}/vpp_lb.py | 0 {test => src/plugins/mactime/test}/test_mactime.py | 0 {test => src/plugins/map/test}/test_map.py | 0 {test => src/plugins/memif/test}/test_memif.py | 0 {test => src/plugins/memif/test}/vpp_memif.py | 0 {test => src/plugins/nat/test}/test_ipsec_nat.py | 0 {test => src/plugins/nat/test}/test_nat.py | 0 {test => src/plugins/pppoe/test}/test_pppoe.py | 0 {test => src/plugins/pppoe/test}/vpp_pppoe_interface.py | 0 {test => src/plugins/quic/test}/test_quic.py | 0 {test => src/plugins/sctp/test}/test_sctp.py | 0 {test => src/plugins/srv6-ad/test}/test_srv6_ad.py | 0 {test => src/plugins/srv6-ad/test}/vpp_srv6.py | 0 {test => src/plugins/srv6-am/test}/test_srv6.py | 0 src/plugins/srv6-am/test/vpp_srv6.py | 1 + {test => src/plugins/srv6-as/test}/test_srv6_as.py | 0 src/plugins/srv6-as/test/vpp_srv6.py | 1 + {test => src/plugins/svs/test}/test_svs.py | 0 test/Makefile | 9 ++++++++- 34 files changed, 10 insertions(+), 1 deletion(-) rename {test => src/plugins/abf/test}/test_abf.py (100%) rename {test => src/plugins/acl/test}/test_acl_plugin.py (100%) rename {test => src/plugins/acl/test}/test_acl_plugin_conns.py (100%) rename {test => src/plugins/acl/test}/test_acl_plugin_l2l3.py (100%) rename {test => src/plugins/acl/test}/test_acl_plugin_macip.py (100%) rename {test => src/plugins/acl/test}/test_classify_l2_acl.py (100%) rename {test => src/plugins/cdp/test}/test_cdp.py (100%) rename {test => src/plugins/flowprobe/test}/test_flowprobe.py (100%) rename {test => src/plugins/gbp/test}/test_gbp.py (100%) rename {test => src/plugins/gtpu/test}/test_gtpu.py (100%) rename {test => src/plugins/igmp/test}/test_igmp.py (100%) rename {test => src/plugins/igmp/test}/vpp_igmp.py (100%) rename {test => src/plugins/l3xc/test}/test_l3xc.py (100%) rename {test => src/plugins/lb/test}/test_lb.py (100%) rename {test => src/plugins/lb/test}/test_lb_api.py (100%) rename {test => src/plugins/lb/test}/vpp_lb.py (100%) rename {test => src/plugins/mactime/test}/test_mactime.py (100%) rename {test => src/plugins/map/test}/test_map.py (100%) rename {test => src/plugins/memif/test}/test_memif.py (100%) rename {test => src/plugins/memif/test}/vpp_memif.py (100%) rename {test => src/plugins/nat/test}/test_ipsec_nat.py (100%) rename {test => src/plugins/nat/test}/test_nat.py (100%) rename {test => src/plugins/pppoe/test}/test_pppoe.py (100%) rename {test => src/plugins/pppoe/test}/vpp_pppoe_interface.py (100%) rename {test => src/plugins/quic/test}/test_quic.py (100%) rename {test => src/plugins/sctp/test}/test_sctp.py (100%) rename {test => src/plugins/srv6-ad/test}/test_srv6_ad.py (100%) rename {test => src/plugins/srv6-ad/test}/vpp_srv6.py (100%) rename {test => src/plugins/srv6-am/test}/test_srv6.py (100%) create mode 120000 src/plugins/srv6-am/test/vpp_srv6.py rename {test => src/plugins/srv6-as/test}/test_srv6_as.py (100%) create mode 120000 src/plugins/srv6-as/test/vpp_srv6.py rename {test => src/plugins/svs/test}/test_svs.py (100%) diff --git a/test/test_abf.py b/src/plugins/abf/test/test_abf.py similarity index 100% rename from test/test_abf.py rename to src/plugins/abf/test/test_abf.py diff --git a/test/test_acl_plugin.py b/src/plugins/acl/test/test_acl_plugin.py similarity index 100% rename from test/test_acl_plugin.py rename to src/plugins/acl/test/test_acl_plugin.py diff --git a/test/test_acl_plugin_conns.py b/src/plugins/acl/test/test_acl_plugin_conns.py similarity index 100% rename from test/test_acl_plugin_conns.py rename to src/plugins/acl/test/test_acl_plugin_conns.py diff --git a/test/test_acl_plugin_l2l3.py b/src/plugins/acl/test/test_acl_plugin_l2l3.py similarity index 100% rename from test/test_acl_plugin_l2l3.py rename to src/plugins/acl/test/test_acl_plugin_l2l3.py diff --git a/test/test_acl_plugin_macip.py b/src/plugins/acl/test/test_acl_plugin_macip.py similarity index 100% rename from test/test_acl_plugin_macip.py rename to src/plugins/acl/test/test_acl_plugin_macip.py diff --git a/test/test_classify_l2_acl.py b/src/plugins/acl/test/test_classify_l2_acl.py similarity index 100% rename from test/test_classify_l2_acl.py rename to src/plugins/acl/test/test_classify_l2_acl.py diff --git a/test/test_cdp.py b/src/plugins/cdp/test/test_cdp.py similarity index 100% rename from test/test_cdp.py rename to src/plugins/cdp/test/test_cdp.py diff --git a/test/test_flowprobe.py b/src/plugins/flowprobe/test/test_flowprobe.py similarity index 100% rename from test/test_flowprobe.py rename to src/plugins/flowprobe/test/test_flowprobe.py diff --git a/test/test_gbp.py b/src/plugins/gbp/test/test_gbp.py similarity index 100% rename from test/test_gbp.py rename to src/plugins/gbp/test/test_gbp.py diff --git a/test/test_gtpu.py b/src/plugins/gtpu/test/test_gtpu.py similarity index 100% rename from test/test_gtpu.py rename to src/plugins/gtpu/test/test_gtpu.py diff --git a/test/test_igmp.py b/src/plugins/igmp/test/test_igmp.py similarity index 100% rename from test/test_igmp.py rename to src/plugins/igmp/test/test_igmp.py diff --git a/test/vpp_igmp.py b/src/plugins/igmp/test/vpp_igmp.py similarity index 100% rename from test/vpp_igmp.py rename to src/plugins/igmp/test/vpp_igmp.py diff --git a/test/test_l3xc.py b/src/plugins/l3xc/test/test_l3xc.py similarity index 100% rename from test/test_l3xc.py rename to src/plugins/l3xc/test/test_l3xc.py diff --git a/test/test_lb.py b/src/plugins/lb/test/test_lb.py similarity index 100% rename from test/test_lb.py rename to src/plugins/lb/test/test_lb.py diff --git a/test/test_lb_api.py b/src/plugins/lb/test/test_lb_api.py similarity index 100% rename from test/test_lb_api.py rename to src/plugins/lb/test/test_lb_api.py diff --git a/test/vpp_lb.py b/src/plugins/lb/test/vpp_lb.py similarity index 100% rename from test/vpp_lb.py rename to src/plugins/lb/test/vpp_lb.py diff --git a/test/test_mactime.py b/src/plugins/mactime/test/test_mactime.py similarity index 100% rename from test/test_mactime.py rename to src/plugins/mactime/test/test_mactime.py diff --git a/test/test_map.py b/src/plugins/map/test/test_map.py similarity index 100% rename from test/test_map.py rename to src/plugins/map/test/test_map.py diff --git a/test/test_memif.py b/src/plugins/memif/test/test_memif.py similarity index 100% rename from test/test_memif.py rename to src/plugins/memif/test/test_memif.py diff --git a/test/vpp_memif.py b/src/plugins/memif/test/vpp_memif.py similarity index 100% rename from test/vpp_memif.py rename to src/plugins/memif/test/vpp_memif.py diff --git a/test/test_ipsec_nat.py b/src/plugins/nat/test/test_ipsec_nat.py similarity index 100% rename from test/test_ipsec_nat.py rename to src/plugins/nat/test/test_ipsec_nat.py diff --git a/test/test_nat.py b/src/plugins/nat/test/test_nat.py similarity index 100% rename from test/test_nat.py rename to src/plugins/nat/test/test_nat.py diff --git a/test/test_pppoe.py b/src/plugins/pppoe/test/test_pppoe.py similarity index 100% rename from test/test_pppoe.py rename to src/plugins/pppoe/test/test_pppoe.py diff --git a/test/vpp_pppoe_interface.py b/src/plugins/pppoe/test/vpp_pppoe_interface.py similarity index 100% rename from test/vpp_pppoe_interface.py rename to src/plugins/pppoe/test/vpp_pppoe_interface.py diff --git a/test/test_quic.py b/src/plugins/quic/test/test_quic.py similarity index 100% rename from test/test_quic.py rename to src/plugins/quic/test/test_quic.py diff --git a/test/test_sctp.py b/src/plugins/sctp/test/test_sctp.py similarity index 100% rename from test/test_sctp.py rename to src/plugins/sctp/test/test_sctp.py diff --git a/test/test_srv6_ad.py b/src/plugins/srv6-ad/test/test_srv6_ad.py similarity index 100% rename from test/test_srv6_ad.py rename to src/plugins/srv6-ad/test/test_srv6_ad.py diff --git a/test/vpp_srv6.py b/src/plugins/srv6-ad/test/vpp_srv6.py similarity index 100% rename from test/vpp_srv6.py rename to src/plugins/srv6-ad/test/vpp_srv6.py diff --git a/test/test_srv6.py b/src/plugins/srv6-am/test/test_srv6.py similarity index 100% rename from test/test_srv6.py rename to src/plugins/srv6-am/test/test_srv6.py diff --git a/src/plugins/srv6-am/test/vpp_srv6.py b/src/plugins/srv6-am/test/vpp_srv6.py new file mode 120000 index 00000000000..78f756605fc --- /dev/null +++ b/src/plugins/srv6-am/test/vpp_srv6.py @@ -0,0 +1 @@ +../../srv6-ad/test/vpp_srv6.py \ No newline at end of file diff --git a/test/test_srv6_as.py b/src/plugins/srv6-as/test/test_srv6_as.py similarity index 100% rename from test/test_srv6_as.py rename to src/plugins/srv6-as/test/test_srv6_as.py diff --git a/src/plugins/srv6-as/test/vpp_srv6.py b/src/plugins/srv6-as/test/vpp_srv6.py new file mode 120000 index 00000000000..78f756605fc --- /dev/null +++ b/src/plugins/srv6-as/test/vpp_srv6.py @@ -0,0 +1 @@ +../../srv6-ad/test/vpp_srv6.py \ No newline at end of file diff --git a/test/test_svs.py b/src/plugins/svs/test/test_svs.py similarity index 100% rename from test/test_svs.py rename to src/plugins/svs/test/test_svs.py diff --git a/test/Makefile b/test/Makefile index 3a92f1413b5..66c8f8a9bb7 100644 --- a/test/Makefile +++ b/test/Makefile @@ -135,8 +135,15 @@ refresh-deps: clean-deps $(PYTHON_DEPENDS) clean-deps: @rm -f $(PYTHON_DEPENDS) +ifneq ($(EXTERN_PLUGIN_SRC_DIR),) +PLUGIN_SRC_DIR=$(EXTERN_PLUGIN_SRC_DIR) +else +PLUGIN_SRC_DIR=$(WS_ROOT)/src/plugins +endif +PLUGIN_TEST_DIRS=$(shell find $(PLUGIN_SRC_DIR) -type d -name test -exec echo -n " -d {}" \;) + define retest-func -@env FORCE_FOREGROUND=$(FORCE_FOREGROUND) FAILED_DIR=$(FAILED_DIR) VENV_PATH=$(VENV_PATH) scripts/setsid_wrapper.sh $(FORCE_FOREGROUND) $(VENV_PATH)/bin/activate $(PYTHON_INTERP) $(PYTHON_PROFILE_OPTS) run_tests.py -d $(TEST_DIR) $(UNITTEST_EXTRA_OPTS) || env FAILED_DIR=$(FAILED_DIR) COMPRESS_FAILED_TEST_LOGS=$(COMPRESS_FAILED_TEST_LOGS) scripts/compress_failed.sh +@env FORCE_FOREGROUND=$(FORCE_FOREGROUND) FAILED_DIR=$(FAILED_DIR) VENV_PATH=$(VENV_PATH) scripts/setsid_wrapper.sh $(FORCE_FOREGROUND) $(VENV_PATH)/bin/activate $(PYTHON_INTERP) $(PYTHON_PROFILE_OPTS) run_tests.py -d $(TEST_DIR)$(PLUGIN_TEST_DIRS) $(UNITTEST_EXTRA_OPTS) || env FAILED_DIR=$(FAILED_DIR) COMPRESS_FAILED_TEST_LOGS=$(COMPRESS_FAILED_TEST_LOGS) scripts/compress_failed.sh endef .PHONY: sanity -- 2.16.6