Skip to content

Commit 9399853

Browse files
committed
Add generate_pipe_name and use in tests
1 parent 876d887 commit 9399853

File tree

3 files changed

+13
-29
lines changed

3 files changed

+13
-29
lines changed

src/packagedef.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export JSONRPCEndpoint, send_notification, send_request, send_success_response, send_error_response
22

3+
include("pipenames.jl")
34
include("core.jl")
45
include("typed.jl")
56
include("interface_def.jl")

src/pipenames.jl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
function generate_pipe_name()
2+
if Sys.iswindows()
3+
return "\\\\.\\pipe\\jl-$(UUIDs.uuid4())"
4+
else
5+
return tempname()
6+
end
7+
end

test/test_typed.jl

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
using Sockets
33
using .TestStructs: Foo, Foo2
44

5-
if Sys.iswindows()
6-
global_socket_name1 = "\\\\.\\pipe\\jsonrpc-testrun1"
7-
elseif Sys.isunix()
8-
global_socket_name1 = joinpath(tempdir(), "jsonrpc-testrun1")
9-
else
10-
error("Unknown operating system.")
11-
end
5+
global_socket_name1 = JSONRPC.generate_pipe_name()
126

137
request1_type = JSONRPC.RequestType("request1", Foo, String)
148
request2_type = JSONRPC.RequestType("request2", Nothing, String)
@@ -65,13 +59,7 @@
6559

6660
# Now we test a faulty server
6761

68-
if Sys.iswindows()
69-
global_socket_name2 = "\\\\.\\pipe\\jsonrpc-testrun2"
70-
elseif Sys.isunix()
71-
global_socket_name2 = joinpath(tempdir(), "jsonrpc-testrun2")
72-
else
73-
error("Unknown operating system.")
74-
end
62+
global_socket_name2 = JSONRPC.generate_pipe_name()
7563

7664
server_is_up = Base.Condition()
7765

@@ -124,14 +112,8 @@ end
124112
@testitem "Static message dispatcher" setup=[TestStructs] begin
125113
using Sockets
126114
using .TestStructs: Foo, Foo2
127-
128-
if Sys.iswindows()
129-
global_socket_name1 = "\\\\.\\pipe\\jsonrpc-testrun3"
130-
elseif Sys.isunix()
131-
global_socket_name1 = joinpath(tempdir(), "jsonrpc-testrun1")
132-
else
133-
error("Unknown operating system.")
134-
end
115+
116+
global_socket_name1 = JSONRPC.generate_pipe_name()
135117

136118
request1_type = JSONRPC.RequestType("request1", Foo, String)
137119
request2_type = JSONRPC.RequestType("request2", Nothing, String)
@@ -189,13 +171,7 @@ end
189171

190172
# Now we test a faulty server
191173

192-
if Sys.iswindows()
193-
global_socket_name2 = "\\\\.\\pipe\\jsonrpc-testrun4"
194-
elseif Sys.isunix()
195-
global_socket_name2 = joinpath(tempdir(), "jsonrpc-testrun2")
196-
else
197-
error("Unknown operating system.")
198-
end
174+
global_socket_name2 = JSONRPC.generate_pipe_name()
199175

200176
server_is_up = Base.Condition()
201177

0 commit comments

Comments
 (0)