Skip to content

Commit dc3d8e4

Browse files
fix: call stop_test directly
1 parent 01bbdff commit dc3d8e4

File tree

3 files changed

+13
-38
lines changed

3 files changed

+13
-38
lines changed

tests/test_5xx.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,26 @@ class ExtensionTester5xx(ExtensionTester):
2222
def __init__(self):
2323
super().__init__()
2424
self.thread = None
25-
self.event = threading.Event()
2625

2726
def on_cmd(self, ten_env: TenEnvTester, cmd: Cmd) -> None:
2827
print(f"on_cmd name {cmd.get_name()}")
2928
ten_env.return_result(CmdResult.create(StatusCode.ERROR), cmd)
3029

31-
event_got = self.event.wait(timeout=5)
32-
if not event_got: # timeout
33-
print("test error")
34-
else:
35-
ten_env.stop_test()
36-
3730
def on_start(self, ten_env: TenEnvTester) -> None:
38-
39-
self.thread = threading.Thread(target=self._async_request, args=[])
31+
self.thread = threading.Thread(
32+
target=self._async_test, args=[ten_env])
4033
self.thread.start()
4134

4235
ten_env.on_start_done()
4336

44-
def _async_request(self) -> None:
37+
def _async_test(self, ten_env: TenEnvTester) -> None:
4538
property_json = {"num": 1, "str": "111"}
4639
r = httpx.post("http://127.0.0.1:8888/cmd/abc",
4740
json=property_json, timeout=5)
4841
print(r)
4942

5043
if r.status_code >= 500:
51-
# TODO: stop test directly once albe to call it in separate thread
52-
# ten_env.stop_test()
53-
self.event.set()
44+
ten_env.stop_test()
5445

5546

5647
def test_5xx():

tests/test_basic.py

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,27 @@ class ExtensionTesterBasic(ExtensionTester):
2020
def __init__(self):
2121
super().__init__()
2222
self.thread = None
23-
self.event = threading.Event()
2423

2524
def on_cmd(self, ten_env: TenEnvTester, cmd: Cmd) -> None:
2625
print(f"on_cmd name {cmd.get_name()}")
2726
ten_env.return_result(CmdResult.create(StatusCode.OK), cmd)
2827

29-
event_got = self.event.wait(timeout=5)
30-
if not event_got: # timeout
31-
print("test error")
32-
else:
33-
ten_env.stop_test()
34-
3528
def on_start(self, ten_env: TenEnvTester) -> None:
3629

37-
self.thread = threading.Thread(target=self._async_request, args=[])
30+
self.thread = threading.Thread(
31+
target=self._async_test, args=[ten_env])
3832
self.thread.start()
3933

4034
ten_env.on_start_done()
4135

42-
def _async_request(self) -> None:
36+
def _async_test(self, ten_env: TenEnvTester) -> None:
4337
property_json = {"num": 1, "str": "111"}
4438
r = httpx.post("http://127.0.0.1:8888/cmd/abc",
4539
json=property_json, timeout=5)
46-
print(r)
40+
print(r)
4741

4842
if r.status_code == httpx.codes.OK:
49-
# TODO: stop test directly once albe to call it in separate thread
50-
# ten_env.stop_test()
51-
self.event.set()
43+
ten_env.stop_test()
5244

5345

5446
def test_basic():

tests/test_set_property.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,27 @@ class ExtensionTesterSetProperty(ExtensionTester):
2020
def __init__(self):
2121
super().__init__()
2222
self.thread = None
23-
self.event = threading.Event()
2423

2524
def on_cmd(self, ten_env: TenEnvTester, cmd: Cmd) -> None:
2625
print(f"on_cmd name {cmd.get_name()}")
2726
ten_env.return_result(CmdResult.create(StatusCode.OK), cmd)
2827

29-
event_got = self.event.wait(timeout=5)
30-
if not event_got: # timeout
31-
print("test error")
32-
else:
33-
ten_env.stop_test()
34-
3528
def on_start(self, ten_env: TenEnvTester) -> None:
3629

37-
self.thread = threading.Thread(target=self._async_request, args=[])
30+
self.thread = threading.Thread(
31+
target=self._async_test, args=[ten_env])
3832
self.thread.start()
3933

4034
ten_env.on_start_done()
4135

42-
def _async_request(self) -> None:
36+
def _async_test(self, ten_env: TenEnvTester) -> None:
4337
property_json = {"num": 1, "str": "111"}
4438
r = httpx.post("http://127.0.0.1:8899/cmd/abc",
4539
json=property_json, timeout=5)
4640
print(r)
4741

4842
if r.status_code == httpx.codes.OK:
49-
# TODO: stop test directly once albe to call it in separate thread
50-
# ten_env.stop_test()
51-
self.event.set()
43+
ten_env.stop_test()
5244

5345

5446
def test_set_property():

0 commit comments

Comments
 (0)