ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "tests: Deprecate the use of CLI commands in tests."

Browse Source 
This reverts commit e2e8f02165.

Change-Id: Ie23dcb8a5b3e96f77e0d117a6887c43064c79669
Signed-off-by: Neale Ranns <nranns@cisco.com>
This commit is contained in:
Neale Ranns
2019-03-19 16:52:27 +00:00
committed by Florin Coras
parent 91f17dc7c4
commit 2e2c91f925
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Makefile
View File

@ -111,7 +111,7 @@ $(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
@touch $@ @touch $@
define retest-func 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 endef
.PHONY: sanity .PHONY: sanity

5
test/vpp_papi_provider.py
View File

@ -9,10 +9,8 @@ import os
import time import time
from collections import deque from collections import deque
import deprecation
from six import moves, iteritems from six import moves, iteritems
from vpp_papi import VPP, mac_pton from vpp_papi import VPP, mac_pton
from hook import Hook from hook import Hook
from vpp_l2 import L2_PORT_TYPE from vpp_l2 import L2_PORT_TYPE
from vpp_ip_route import MPLS_IETF_MAX_LABEL, MPLS_LABEL_INVALID 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) self.hook.after_api(api_fn.__name__, api_args)
return reply return reply
@deprecation.deprecated(
deprecated_in="19.04", removed_in="19.07",
details="Use the Corresponding API function instead.")
def cli(self, cli): def cli(self, cli):
""" Execute a CLI, calling the before/after hooks appropriately. """ Execute a CLI, calling the before/after hooks appropriately.