Skip to content

Commit 88721ca

Browse files
authored
deps: Upgrade vest to 1.10.4 (#548)
1 parent 95dca85 commit 88721ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1651
-357
lines changed

addons/vest/_generated-mixins/1-8182042.gd

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,18 @@ func _get_suite() -> VestDefs.Suite:
6161
await call(method["name"])
6262

6363
for method in case_methods:
64-
test(method["name"].trim_prefix("test").capitalize(), func(): await call(method["name"]))
64+
var method_name := method["name"] as String
65+
var test_name := method_name.trim_prefix("test").trim_suffix("__only").capitalize()
66+
var callback := func(): await call(method["name"])
67+
var is_only := _is_only(method_name)
68+
69+
test(test_name, callback, is_only, method_name)
6570

6671
for method in parametric_methods:
72+
var method_name := method["name"] as String
73+
var test_name := method_name.trim_prefix("test").trim_suffix("__only").capitalize()
74+
var is_only := _is_only(method_name)
75+
6776
var param_provider_name := method["default_args"][0] as String
6877
if not has_method(param_provider_name):
6978
push_warning(
@@ -80,7 +89,12 @@ func _get_suite() -> VestDefs.Suite:
8089

8190
for i in range(params.size()):
8291
test(
83-
"%s#%d %s" % [method["name"].trim_prefix("test").capitalize(), i+1, params[i]],
84-
func(): await callv(method["name"], params[i])
92+
"%s#%d %s" % [test_name, i+1, params[i]],
93+
func(): await callv(method["name"], params[i]),
94+
is_only,
95+
method_name
8596
)
8697
)
98+
99+
func _is_only(name: String) -> bool:
100+
return name.ends_with("__only")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uid://cg53q8t5aibti
1+
uid://mm20mdmsc5ii
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uid://d168ndvsqupun
1+
uid://caf7owv25i7op
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uid://8ojcq7eq3de3
1+
uid://d3mmot6r5ycm6
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uid://hlpirirrosh8
1+
uid://v3npn3goh4em
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uid://hgh0houeje1w
1+
uid://c8oa5ooaqwi11
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uid://bki88xn3pwurs
1+
uid://dqqt1ecooeqdd

addons/vest/cli/vest-cli-runner.gd

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
extends RefCounted
2+
class_name VestCLIRunner
3+
4+
## Implements functionality to run tests
5+
6+
var _peer: StreamPeerTCP = null
7+
8+
## Run tests with [Params]
9+
func run(params: VestCLI.Params) -> int:
10+
var validation_errors := params.validate()
11+
if not validation_errors.is_empty():
12+
for error in validation_errors:
13+
OS.alert(error)
14+
push_error(error)
15+
return 1
16+
17+
await _connect(params)
18+
19+
var results := await _run_tests(params)
20+
_report(params, results)
21+
_send_results_over_network(params, results)
22+
23+
_disconnect()
24+
25+
if results.get_aggregate_status() == VestResult.TEST_PASS:
26+
print_rich("All tests [color=green]passed[/color]!")
27+
return 0
28+
else:
29+
print_rich("There are test [color=red]failures[/color]!")
30+
return 1
31+
32+
func _run_tests(params: VestCLI.Params) -> VestResult.Suite:
33+
var runner := VestLocalRunner.new()
34+
runner.on_partial_result.connect(func(result: VestResult.Suite):
35+
if _peer != null:
36+
if result != null:
37+
_peer.put_var(result._to_wire(), true)
38+
else:
39+
_peer.put_var(result, true)
40+
)
41+
42+
var results: VestResult.Suite
43+
if params.run_file:
44+
results = await runner.run_script_at(params.run_file, params.only_mode)
45+
elif params.run_glob:
46+
results = await runner.run_glob(params.run_glob, params.only_mode)
47+
48+
return results
49+
50+
func _report(params: VestCLI.Params, results: VestResult.Suite):
51+
var report := TAPReporter.report(results)
52+
53+
if params.report_format:
54+
if params.report_file in ["", "-"]:
55+
print(report)
56+
else:
57+
var fa := FileAccess.open(params.report_file, FileAccess.WRITE)
58+
fa.store_string(report)
59+
fa.close()
60+
61+
func _connect(params: VestCLI.Params):
62+
if not params.host and params.port == -1:
63+
return
64+
65+
var host := params.host
66+
var port := params.port
67+
68+
if not host: host = "127.0.0.1"
69+
if port == -1: port = 54932
70+
71+
var peer := StreamPeerTCP.new()
72+
var err := peer.connect_to_host(host, port)
73+
if err != OK:
74+
push_warning("Couldn't connect on port %d! %s" % [port, error_string(err)])
75+
return
76+
77+
await Vest.until(func(): peer.poll(); return peer.get_status() != StreamPeerTCP.STATUS_CONNECTING)
78+
if peer.get_status() != StreamPeerTCP.STATUS_CONNECTED:
79+
push_warning("Connection failed! Socket status: %d" % [peer.get_status()])
80+
return
81+
82+
peer.set_no_delay(true)
83+
_peer = peer
84+
85+
func _disconnect():
86+
if _peer != null:
87+
_peer.disconnect_from_host()
88+
89+
func _send_results_over_network(params: VestCLI.Params, results: VestResult.Suite):
90+
if not _peer:
91+
return
92+
93+
_peer.put_var(results._to_wire(), true)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://bw0ajf5t50wi0

addons/vest/cli/vest-cli-scene.tscn

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
[sub_resource type="GDScript" id="GDScript_de1pc"]
44
script/source = "extends Node
55

6+
# Used to run tests in debug mode
7+
68
func _ready():
79
Vest._register_scene_tree(get_tree())
810
DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_MINIMIZED)
911

1012
var params := Vest.__.LocalSettings.run_params
1113

12-
var runner := VestCLI.Runner.new()
14+
var runner := VestCLIRunner.new()
1315
var exit_code := await runner.run(params)
1416

1517
get_tree().quit(exit_code)

0 commit comments

Comments
 (0)