Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
build: deprecate debian-9 support
[vpp.git]
/
test
/
framework.py
diff --git
a/test/framework.py
b/test/framework.py
index
82d1c35
..
f577513
100644
(file)
--- a/
test/framework.py
+++ b/
test/framework.py
@@
-7,6
+7,7
@@
import sys
import os
import select
import signal
import os
import select
import signal
+import subprocess
import unittest
import tempfile
import time
import unittest
import tempfile
import time
@@
-40,19
+41,6
@@
from scapy.layers.inet import IPerror, TCPerror, UDPerror, ICMPerror
from scapy.layers.inet6 import ICMPv6DestUnreach, ICMPv6EchoRequest
from scapy.layers.inet6 import ICMPv6EchoReply
from scapy.layers.inet6 import ICMPv6DestUnreach, ICMPv6EchoRequest
from scapy.layers.inet6 import ICMPv6EchoReply
-if os.name == 'posix' and sys.version_info[0] < 3:
- # using subprocess32 is recommended by python official documentation
- # @ https://docs.python.org/2/library/subprocess.html
- import subprocess32 as subprocess
-else:
- import subprocess
-
-# Python2/3 compatible
-try:
- input = raw_input
-except NameError:
- pass
-
logger = logging.getLogger(__name__)
# Set up an empty logger for the testcase that can be overridden as necessary
logger = logging.getLogger(__name__)
# Set up an empty logger for the testcase that can be overridden as necessary
@@
-231,14
+219,6
@@
def _running_gcov_tests():
running_gcov_tests = _running_gcov_tests()
running_gcov_tests = _running_gcov_tests()
-def _running_on_centos():
- os_id = os.getenv("OS_ID", "")
- return True if "centos" in os_id.lower() else False
-
-
-running_on_centos = _running_on_centos()
-
-
class KeepAliveReporter(object):
"""
Singleton object which reports test start to parent process
class KeepAliveReporter(object):
"""
Singleton object which reports test start to parent process