Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ioam: fix coverity warning/NULL dereference
[vpp.git]
/
test
/
test_punt.py
diff --git
a/test/test_punt.py
b/test/test_punt.py
old mode 100644
(file)
new mode 100755
(executable)
index
c6d6dbc
..
3471a3f
--- a/
test/test_punt.py
+++ b/
test/test_punt.py
@@
-46,11
+46,11
@@
class serverSocketThread(threading.Thread):
self.sockName = sockName
self.sock = None
self.rx_pkts = []
self.sockName = sockName
self.sock = None
self.rx_pkts = []
- self.
keep_running = Tru
e
+ self.
stop_running = Fals
e
def rx_packets(self):
# Wait for some packets on socket
def rx_packets(self):
# Wait for some packets on socket
- while
self.keep_running
:
+ while
True
:
try:
data = self.sock.recv(65536)
try:
data = self.sock.recv(65536)
@@
-61,7
+61,9
@@
class serverSocketThread(threading.Thread):
self.rx_pkts.append(Ether(data[8:]))
except IOError as e:
if e.errno == 11:
self.rx_pkts.append(Ether(data[8:]))
except IOError as e:
if e.errno == 11:
- # nothing to receive, sleep a little
+ # nothing to receive, stop running or sleep a little
+ if self.stop_running:
+ break
time.sleep(0.1)
pass
else:
time.sleep(0.1)
pass
else:
@@
-81,8
+83,9
@@
class serverSocketThread(threading.Thread):
self.rx_packets()
def close(self):
self.rx_packets()
def close(self):
+ self.stop_running = True
+ threading.Thread.join(self)
self.sock.close()
self.sock.close()
- self.keep_running = False
return self.rx_pkts
return self.rx_pkts
@@
-131,7
+134,6
@@
class TestPuntSocket(VppTestCase):
rx_pkts = []
for thread in self.sock_servers:
rx_pkts += thread.close()
rx_pkts = []
for thread in self.sock_servers:
rx_pkts += thread.close()
- thread.join()
return rx_pkts
def verify_port(self, pr, vpr):
return rx_pkts
def verify_port(self, pr, vpr):