aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-03-19 16:52:27 +0000
committerFlorin Coras <florin.coras@gmail.com>2019-03-19 17:56:54 +0000
commit2e2c91f9256ff06cb79bc9816772e098dd6b7987 (patch)
tree2f87d5541b37ece1df39057026a02440692eda67
parent91f17dc7c4e79343b8fba924e7cea6380a0e6653 (diff)
Revert "tests: Deprecate the use of CLI commands in tests."
This reverts commit e2e8f02165f27ae04e6d20ce0c628e29271a8db6. Change-Id: Ie23dcb8a5b3e96f77e0d117a6887c43064c79669 Signed-off-by: Neale Ranns <nranns@cisco.com>
-rw-r--r--test/Makefile2
-rw-r--r--test/vpp_papi_provider.py5
2 files changed, 1 insertions, 6 deletions
diff --git a/test/Makefile b/test/Makefile
index e5e63d7afe5..f78c8a8ca69 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -111,7 +111,7 @@ $(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
@touch $@
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) -Wd $(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) $(UNITTEST_EXTRA_OPTS) || env FAILED_DIR=$(FAILED_DIR) COMPRESS_FAILED_TEST_LOGS=$(COMPRESS_FAILED_TEST_LOGS) scripts/compress_failed.sh
endef
.PHONY: sanity
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 95c22dd2104..9133683d402 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -9,10 +9,8 @@ import os
import time
from collections import deque
-import deprecation
from six import moves, iteritems
from vpp_papi import VPP, mac_pton
-
from hook import Hook
from vpp_l2 import L2_PORT_TYPE
from vpp_ip_route import MPLS_IETF_MAX_LABEL, MPLS_LABEL_INVALID
@@ -389,9 +387,6 @@ class VppPapiProvider(object):
self.hook.after_api(api_fn.__name__, api_args)
return reply
- @deprecation.deprecated(
- deprecated_in="19.04", removed_in="19.07",
- details="Use the Corresponding API function instead.")
def cli(self, cli):
""" Execute a CLI, calling the before/after hooks appropriately.