Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VOM: mroutes
[vpp.git]
/
test
/
framework.py
diff --git
a/test/framework.py
b/test/framework.py
index
e3cf68d
..
7633ca0
100644
(file)
--- a/
test/framework.py
+++ b/
test/framework.py
@@
-40,6
+40,12
@@
if os.name == 'posix' and sys.version_info[0] < 3:
else:
import subprocess
else:
import subprocess
+# Python2/3 compatible
+try:
+ input = raw_input
+except NameError:
+ pass
+
PASS = 0
FAIL = 1
ERROR = 2
PASS = 0
FAIL = 1
ERROR = 2
@@
-347,7
+353,7
@@
class VppTestCase(unittest.TestCase):
print("Now is the time to attach a gdb by running the above "
"command and set up breakpoints etc.")
print(single_line_delim)
print("Now is the time to attach a gdb by running the above "
"command and set up breakpoints etc.")
print(single_line_delim)
-
raw_
input("Press ENTER to continue running the testcase...")
+ input("Press ENTER to continue running the testcase...")
@classmethod
def run_vpp(cls):
@classmethod
def run_vpp(cls):
@@
-487,8
+493,8
@@
class VppTestCase(unittest.TestCase):
print(double_line_delim)
print("VPP or GDB server is still running")
print(single_line_delim)
print(double_line_delim)
print("VPP or GDB server is still running")
print(single_line_delim)
-
raw_
input("When done debugging, press ENTER to kill the "
-
"process and finish running the testcase...")
+ input("When done debugging, press ENTER to kill the "
+ "process and finish running the testcase...")
# first signal that we want to stop the pump thread, then wake it up
if hasattr(cls, 'pump_thread_stop_flag'):
# first signal that we want to stop the pump thread, then wake it up
if hasattr(cls, 'pump_thread_stop_flag'):
@@
-1002,6
+1008,11
@@
class VppTestCase(unittest.TestCase):
return rx
return rx
+ def runTest(self):
+ """ unittest calls runTest when TestCase is instantiated without a
+ test case. Use case: Writing unittests against VppTestCase"""
+ pass
+
def get_testcase_doc_name(test):
return getdoc(test.__class__).splitlines()[0]
def get_testcase_doc_name(test):
return getdoc(test.__class__).splitlines()[0]