tests: switch test framework to python3 by default

Type: make
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: I84d32f022d9dc555837c8916feba04a224cd262a

diff --git a/test/Makefile b/test/Makefile
index abc611c..7ec8d4a 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -78,7 +78,7 @@ TEST_RUN_DIR:=$(VENV_PATH)/run
 endif
 
 ifeq ($(PYTHON),)
-PYTHON_INTERP=python2.7
+PYTHON_INTERP=python3.6
 else
 PYTHON_INTERP=$(PYTHON)
 endif
@@ -234,8 +234,8 @@ wipe: reset
        @rm -f $(PAPI_INSTALL_FLAGS)
 
 doc: verify-test-dir $(PIP_PATCH_DONE)
-       @virtualenv $(VENV_PATH) -p python3
-       @bash -c "source $(VENV_PATH)/bin/activate && python3 -m pip install sphinx sphinx-rtd-theme"
+       @bash -c "source $(VENV_PATH)/bin/activate && \
+                 $(PYTHON_INTERP) -m pip install sphinx sphinx-rtd-theme"
        @bash -c "source $(VENV_PATH)/bin/activate && make -C doc WS_ROOT=$(WS_ROOT) BR=$(BR) html"
 
 .PHONY: wipe-doc
@@ -267,9 +267,9 @@ papi-wipe:
        @rm -rf $(PAPI_INSTALL_DONE)
 
 .PHONY: checkstyle
-checkstyle: verify-test-dir
-       @virtualenv $(VENV_PATH) -p python3
-       @bash -c "source $(VENV_PATH)/bin/activate && python3 -m pip install pycodestyle"
+checkstyle: verify-test-dir $(PIP_INSTALL_DONE)
+       @bash -c "source $(VENV_PATH)/bin/activate &&\
+                 $(PYTHON_INTERP) -m pip install pycodestyle"
        @bash -c "source $(VENV_PATH)/bin/activate &&\
                pycodestyle --show-source --ignore=W504,E126,E241,E226,E305,E704,E741,E722 --exclude=$(WS_ROOT)/test/_*.py -v $(WS_ROOT)/test/*.py $(PLUGIN_SRC_DIR)/*/test/*.py ||\
                (echo \"*******************************************************************\" &&\

diff --git a/test/test_stats_client.py b/test/test_stats_client.py
index dcbf0fe..857e6e4 100644 (file)
--- a/test/test_stats_client.py
+++ b/test/test_stats_client.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 
 import unittest
 import time