Skip to content

Commit 7b07bab

Browse files
committed
rebase and minor fixes
1 parent d188c21 commit 7b07bab

File tree

4 files changed

+31
-12
lines changed

4 files changed

+31
-12
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
version:
16-
- '1.3'
16+
- '1.5'
1717
- '1' # automatically expands to the latest stable 1.x release of Julia
1818
os:
1919
- ubuntu-latest

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "gRPCClient"
22
uuid = "aaca4a50-36af-4a1d-b878-4c443f2061ad"
33
authors = ["Tanmay K.M. <[email protected]>"]
4-
version = "0.1.2"
4+
version = "0.1.3"
55

66
[deps]
77
Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
@@ -12,7 +12,7 @@ ProtoBuf = "3349acd9-ac6a-5e09-bcdb-63829b23a429"
1212
Downloads = "1.3"
1313
LibCURL = "0.6"
1414
ProtoBuf = "0.11"
15-
julia = "1.3"
15+
julia = "1.5"
1616

1717
[extras]
1818
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

test/runtests_routeguide.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ server_endpoint = isempty(ARGS) ? "http://localhost:10000/" : ARGS[1]
8080
else
8181
@info("skipping code generation on Windows to avoid needing batch file execution permissions")
8282
end
83-
83+
8484
test_timeout_header_values()
8585

8686
include("test_routeclient.jl")

test/test_routeclient.jl

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,16 +209,35 @@ end
209209

210210
function test_threaded_clients(server_endpoint::String)
211211
@info("testing threaded blocking client")
212-
Threads.@threads for idx in 1:10
213-
client = RouteGuideBlockingClient(server_endpoint; verbose=false)
214-
test_blocking_client(client)
215-
close(client.channel)
212+
213+
testsetslck = ReentrantLock()
214+
topts = Test.get_testset()
215+
function recordts(ts)
216+
lock(testsetslck) do
217+
for result in ts.results
218+
Test.record(topts, result)
219+
end
220+
end
221+
end
222+
223+
Test.TESTSET_PRINT_ENABLE[] = false
224+
Threads.@threads for _idx in 1:10
225+
ts = @testset "threaded blocking client" begin
226+
client = RouteGuideBlockingClient(server_endpoint; verbose=false)
227+
test_blocking_client(client)
228+
close(client.channel)
229+
end
230+
recordts(ts)
216231
end
217232

218233
@info("testing threaded async client")
219-
Threads.@threads for idx in 1:10
220-
client = RouteGuideClient(server_endpoint; verbose=false)
221-
test_async_client(client)
222-
close(client.channel)
234+
Threads.@threads for _idx in 1:10
235+
ts = @testset "threaded async client" begin
236+
client = RouteGuideClient(server_endpoint; verbose=false)
237+
test_async_client(client)
238+
close(client.channel)
239+
end
240+
recordts(ts)
223241
end
242+
Test.TESTSET_PRINT_ENABLE[] = true
224243
end

0 commit comments

Comments
 (0)