From: Waldemar Kozaczuk <jwkozac...@gmail.com>
Committer: Waldemar Kozaczuk <jwkozac...@gmail.com>
Branch: master
scripts: re-enable tcp_close_without_reading to run on firecracker
Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
---
diff --git a/scripts/test.py b/scripts/test.py
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -22,9 +22,13 @@
"tst-feexcept.so",
]
+qemu_blacklist= [
+ "tcp_close_without_reading_on_firecracker"
+]
+
firecracker_blacklist= [
"tracing_smoke_test",
- "tcp_close_without_reading", #This test is flaky under firecracker due to
a bug possibly in firecracker itself
+ "tcp_close_without_reading_on_qemu"
]
add_tests([
@@ -201,4 +205,6 @@ def main():
run_py_args = []
if cmdargs.hypervisor == 'firecracker':
blacklist.extend(firecracker_blacklist)
+ else:
+ blacklist.extend(qemu_blacklist)
main()
diff --git a/scripts/tests/test_net.py b/scripts/tests/test_net.py
--- a/scripts/tests/test_net.py
+++ b/scripts/tests/test_net.py
@@ -5,16 +5,15 @@
def is_broken_pipe_error(e):
return isinstance(e, IOError) and e.errno == errno.EPIPE
-@test
-def tcp_close_without_reading():
+def tcp_close_without_reading(hypervisor, host_name):
host_port = 7777
server = run_command_in_guest('/tests/misc-tcp-close-without-reading.so',
- forward=[(host_port, 7777)])
+ forward=[(host_port, 7777)], hypervisor=hypervisor)
wait_for_line(server, 'listening...')
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- s.connect(('localhost', host_port))
+ s.connect((host_name, host_port))
try:
while server.is_alive():
s.sendall(b'.' * 1024)
@@ -23,3 +22,11 @@ def tcp_close_without_reading():
raise
server.join()
+
+@test
+def tcp_close_without_reading_on_qemu():
+ tcp_close_without_reading('qemu', 'localhost')
+
+@test
+def tcp_close_without_reading_on_firecracker():
+ tcp_close_without_reading('firecracker', '172.16.0.2')
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/osv-dev/00000000000022b9a2059f2c24fb%40google.com.
