Skip to content

Commit 0067d1f

Browse files
gabis-precoggabis-precog
committed
refactored test examples. upgrade java server version to 1.1.3
1 parent 708da91 commit 0067d1f

File tree

2 files changed

+72
-146
lines changed

2 files changed

+72
-146
lines changed

‎examples/java/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
<dependency>
4747
<groupId>io.rsocket</groupId>
4848
<artifactId>rsocket-core</artifactId>
49-
<version>1.1.2</version>
49+
<version>1.1.3</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>io.rsocket</groupId>
5353
<artifactId>rsocket-transport-netty</artifactId>
54-
<version>1.1.2</version>
54+
<version>1.1.3</version>
5555
</dependency>
5656
</dependencies>
5757

‎examples/test_examples.py‎

Lines changed: 70 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -6,161 +6,87 @@
66
import pytest
77

88

9-
@pytest.mark.timeout(12)
10-
def test_simple_client_server(unused_tcp_port):
11-
pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server.py', str(unused_tcp_port))
9+
@pytest.mark.timeout(20)
10+
@pytest.mark.parametrize('server_cli, client_cli', (
11+
(
12+
lambda unused_tcp_port: os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server.py',
13+
str(unused_tcp_port)),
14+
lambda unused_tcp_port: subprocess.Popen(['python3', './client.py', str(unused_tcp_port)])
15+
),
16+
(
17+
lambda unused_tcp_port: os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_quic.py',
18+
str(unused_tcp_port)),
19+
lambda unused_tcp_port: subprocess.Popen(['python3', './client_quic.py', str(unused_tcp_port)])
20+
),
21+
(
22+
lambda unused_tcp_port: os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_routing.py',
23+
'--port', str(unused_tcp_port)),
24+
lambda unused_tcp_port: subprocess.Popen(['python3', './client_with_routing.py', str(unused_tcp_port)])
25+
),
26+
(
27+
lambda unused_tcp_port: run_java_class('io.rsocket.pythontest.ServerWithFragmentation',
28+
unused_tcp_port),
29+
lambda unused_tcp_port: subprocess.Popen(['python3', './client_with_routing.py', str(unused_tcp_port)])
30+
),
31+
(
32+
lambda unused_tcp_port: os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_routing.py',
33+
'--port', str(unused_tcp_port)),
34+
lambda unused_tcp_port: subprocess.Popen(['python3', './client_rx.py', str(unused_tcp_port)])
35+
),
36+
(
37+
lambda unused_tcp_port: os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_aiohttp_websocket.py',
38+
str(unused_tcp_port)),
39+
lambda unused_tcp_port: subprocess.Popen(['python3', './client_websocket.py', str(unused_tcp_port)])
40+
),
41+
(
42+
lambda unused_tcp_port: os.spawnlp(os.P_NOWAIT, 'python3', 'python3', 'server_aiohttp_websocket.py',
43+
'--port', str(unused_tcp_port),
44+
'--with-ssl'),
45+
lambda unused_tcp_port: subprocess.Popen(
46+
['python3', './client_websocket.py', '--port', str(unused_tcp_port), '--with-ssl'])
47+
),
48+
(
49+
lambda unused_tcp_port: os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_quart_websocket.py',
50+
'--port', str(unused_tcp_port)),
51+
lambda unused_tcp_port: subprocess.Popen(
52+
['python3', './client_websocket.py', '--port', str(unused_tcp_port)])
53+
),
54+
(
55+
lambda unused_tcp_port: run_java_class('io.rsocket.pythontest.Server', unused_tcp_port),
56+
lambda unused_tcp_port: subprocess.Popen(
57+
['python3', './run_against_example_java_server.py', str(unused_tcp_port)])
58+
),
59+
(
60+
lambda unused_tcp_port: os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_routing.py',
61+
'--port', str(unused_tcp_port)),
62+
lambda unused_tcp_port: subprocess.Popen(['java',
63+
'-cp', 'java/target/rsocket-examples-1.jar',
64+
'io.rsocket.pythontest.Client',
65+
'%d' % unused_tcp_port])
66+
),
67+
(
68+
lambda unused_tcp_port: os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_lease.py',
69+
str(unused_tcp_port)),
70+
lambda unused_tcp_port: subprocess.Popen(['java',
71+
'-cp', 'java/target/rsocket-examples-1.jar',
72+
'io.rsocket.pythontest.ClientWithLease',
73+
'%d' % unused_tcp_port])
74+
),
75+
))
76+
def test_client_server_combinations(unused_tcp_port, server_cli, client_cli):
77+
pid = server_cli(unused_tcp_port)
1278

1379
try:
1480
sleep(2)
15-
client = subprocess.Popen(['python3', './client.py', str(unused_tcp_port)])
16-
client.wait(timeout=10)
17-
18-
assert client.returncode == 0
19-
finally:
20-
os.kill(pid, signal.SIGTERM)
21-
22-
23-
@pytest.mark.timeout(12)
24-
def test_quic_client_server(unused_tcp_port):
25-
pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_quic.py', str(unused_tcp_port))
26-
27-
try:
28-
sleep(2)
29-
client = subprocess.Popen(['python3', './client_quic.py', str(unused_tcp_port)])
30-
client.wait(timeout=10)
31-
32-
assert client.returncode == 0
33-
finally:
34-
os.kill(pid, signal.SIGTERM)
35-
36-
37-
@pytest.mark.timeout(30)
38-
def test_client_server_with_routing(unused_tcp_port):
39-
pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_routing.py', '--port', str(unused_tcp_port))
40-
41-
try:
42-
sleep(2)
43-
client = subprocess.Popen(['python3', './client_with_routing.py', str(unused_tcp_port)])
44-
client.wait(timeout=20)
45-
46-
assert client.returncode == 0
47-
finally:
48-
os.kill(pid, signal.SIGTERM)
49-
50-
51-
@pytest.mark.timeout(30)
52-
def test_client_java_server_with_routing_and_fragmentation(unused_tcp_port):
53-
pid = run_java_class('io.rsocket.pythontest.ServerWithFragmentation', unused_tcp_port)
54-
55-
try:
56-
sleep(2)
57-
client = subprocess.Popen(['python3', './client_with_routing.py', str(unused_tcp_port)])
81+
client = client_cli(unused_tcp_port)
5882
client.wait(timeout=20)
5983

6084
assert client.returncode == 0
6185
finally:
6286
os.kill(pid, signal.SIGTERM)
6387

6488

65-
@pytest.mark.timeout(30)
66-
def test_rx_client_server_with_routing(unused_tcp_port):
67-
pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_routing.py', '--port', str(unused_tcp_port))
68-
69-
try:
70-
sleep(2)
71-
client = subprocess.Popen(['python3', './client_rx.py', str(unused_tcp_port)])
72-
client.wait(timeout=20)
73-
74-
assert client.returncode == 0
75-
finally:
76-
os.kill(pid, signal.SIGTERM)
77-
78-
79-
def test_client_server_over_websocket_aiohttp(unused_tcp_port):
80-
pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_aiohttp_websocket.py', str(unused_tcp_port))
81-
82-
try:
83-
sleep(2)
84-
client = subprocess.Popen(['python3', './client_websocket.py', str(unused_tcp_port)])
85-
client.wait(timeout=3)
86-
87-
assert client.returncode == 0
88-
finally:
89-
os.kill(pid, signal.SIGTERM)
90-
91-
92-
def test_client_server_over_websocket_secure_aiohttp(unused_tcp_port):
93-
pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', 'server_aiohttp_websocket.py', '--port', str(unused_tcp_port),
94-
'--with-ssl')
95-
96-
try:
97-
sleep(2)
98-
client = subprocess.Popen(['python3', './client_websocket.py', '--port', str(unused_tcp_port), '--with-ssl'])
99-
client.wait(timeout=3)
100-
101-
assert client.returncode == 0
102-
finally:
103-
os.kill(pid, signal.SIGTERM)
104-
105-
106-
def test_client_server_over_websocket_quart(unused_tcp_port):
107-
pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_quart_websocket.py', '--port', str(unused_tcp_port))
108-
109-
try:
110-
sleep(2)
111-
client = subprocess.Popen(['python3', './client_websocket.py', '--port', str(unused_tcp_port)])
112-
client.wait(timeout=3)
113-
114-
assert client.returncode == 0
115-
finally:
116-
os.kill(pid, signal.SIGTERM)
117-
118-
119-
def test_client_java_server(unused_tcp_port):
120-
pid = run_java_class('io.rsocket.pythontest.Server', unused_tcp_port)
121-
122-
try:
123-
sleep(2)
124-
client = subprocess.Popen(['python3', './run_against_example_java_server.py', str(unused_tcp_port)])
125-
client.wait(timeout=6)
126-
127-
assert client.returncode == 0
128-
finally:
129-
os.kill(pid, signal.SIGTERM)
130-
131-
13289
def run_java_class(java_class: str, unused_tcp_port: int):
13390
return os.spawnlp(os.P_NOWAIT, 'java', 'java',
13491
'-cp', 'java/target/rsocket-examples-1.jar', java_class,
13592
'%d' % unused_tcp_port)
136-
137-
138-
def test_java_client_server(unused_tcp_port):
139-
pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_routing.py', '--port', str(unused_tcp_port))
140-
141-
try:
142-
sleep(2)
143-
client = subprocess.Popen(['java',
144-
'-cp', 'java/target/rsocket-examples-1.jar', 'io.rsocket.pythontest.Client',
145-
'%d' % unused_tcp_port])
146-
client.wait(timeout=6)
147-
148-
assert client.returncode == 0
149-
finally:
150-
os.kill(pid, signal.SIGTERM)
151-
152-
153-
@pytest.mark.timeout(30)
154-
def test_java_client_server_lease(unused_tcp_port):
155-
pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_lease.py', str(unused_tcp_port))
156-
157-
try:
158-
sleep(2)
159-
client = subprocess.Popen(['java',
160-
'-cp', 'java/target/rsocket-examples-1.jar', 'io.rsocket.pythontest.ClientWithLease',
161-
'%d' % unused_tcp_port])
162-
client.wait(timeout=15)
163-
164-
assert client.returncode == 0
165-
finally:
166-
os.kill(pid, signal.SIGTERM)

0 commit comments

Comments
 (0)