Skip to content

Commit af13a5d

Browse files
tanmaykmtanmaykm
authored
test(live): update test suite for v2 job images (#108)
* fix test code setting results for v2 compat * more set result changes * update distributed test project and manifest * update distributed test vor v2 * fix format * update results_file usage for v2 * fix distributed, typo in results file test * app completed status possible on graceful stop * fix results file test * fix distributed test * fix * try tolerate both stopped and completed status * do not submit appbundle for sysimage test * skip appbundle test if julia version doesn't match
1 parent 9d828d6 commit af13a5d

File tree

9 files changed

+258
-57
lines changed

9 files changed

+258
-57
lines changed

‎test/jobenvs/job-dist/Manifest.toml‎

Lines changed: 145 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,206 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.9.4"
3+
julia_version = "1.11.7"
44
manifest_format = "2.0"
5-
project_hash = "15b8400de0ed6d0aa5f96c6341a036f45951aee0"
5+
project_hash = "0d521bbd8bb6739e51557d680232c96ed350e3a1"
6+
7+
[[deps.ArgTools]]
8+
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
9+
version = "1.1.2"
10+
11+
[[deps.Artifacts]]
12+
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
13+
version = "1.11.0"
14+
15+
[[deps.Base64]]
16+
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
17+
version = "1.11.0"
618

719
[[deps.Dates]]
820
deps = ["Printf"]
921
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
22+
version = "1.11.0"
1023

1124
[[deps.Distributed]]
1225
deps = ["Random", "Serialization", "Sockets"]
1326
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
27+
version = "1.11.0"
28+
29+
[[deps.Downloads]]
30+
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
31+
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
32+
version = "1.6.0"
33+
34+
[[deps.ElasticClusterManager]]
35+
deps = ["Distributed", "Logging", "MbedTLS", "Pkg", "Serialization", "Sockets", "TLSStreams"]
36+
git-tree-sha1 = "cb58f5f1424daf58c02df426decdd0b8d468a3fc"
37+
uuid = "5d47888a-328e-4da2-b0ad-c7c2d6e59f6b"
38+
version = "0.2.2"
39+
40+
[[deps.FileWatching]]
41+
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
42+
version = "1.11.0"
1443

1544
[[deps.JSON]]
1645
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
1746
git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a"
1847
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
1948
version = "0.21.4"
2049

50+
[[deps.JuliaHubDistributed]]
51+
deps = ["Distributed", "Downloads", "ElasticClusterManager", "Sockets", "TLSStreams"]
52+
git-tree-sha1 = "8928ce5a1febee2edbe5635fe03e74705e809a98"
53+
uuid = "ac0873db-f1c6-408a-a97a-f3c80a675215"
54+
version = "0.2.0"
55+
56+
[[deps.LibCURL]]
57+
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
58+
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
59+
version = "0.6.4"
60+
61+
[[deps.LibCURL_jll]]
62+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
63+
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
64+
version = "8.6.0+0"
65+
66+
[[deps.LibGit2]]
67+
deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"]
68+
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
69+
version = "1.11.0"
70+
71+
[[deps.LibGit2_jll]]
72+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"]
73+
uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
74+
version = "1.7.2+0"
75+
76+
[[deps.LibSSH2_jll]]
77+
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
78+
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
79+
version = "1.11.0+1"
80+
81+
[[deps.Libdl]]
82+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
83+
version = "1.11.0"
84+
85+
[[deps.Logging]]
86+
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
87+
version = "1.11.0"
88+
89+
[[deps.Markdown]]
90+
deps = ["Base64"]
91+
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
92+
version = "1.11.0"
93+
94+
[[deps.MbedTLS]]
95+
deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"]
96+
git-tree-sha1 = "c067a280ddc25f196b5e7df3877c6b226d390aaf"
97+
uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
98+
version = "1.1.9"
99+
100+
[[deps.MbedTLS_jll]]
101+
deps = ["Artifacts", "Libdl"]
102+
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
103+
version = "2.28.6+0"
104+
21105
[[deps.Mmap]]
22106
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
107+
version = "1.11.0"
108+
109+
[[deps.MozillaCACerts_jll]]
110+
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
111+
version = "2023.12.12"
112+
113+
[[deps.NetworkOptions]]
114+
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
115+
version = "1.2.0"
23116

24117
[[deps.Parsers]]
25118
deps = ["Dates", "PrecompileTools", "UUIDs"]
26-
git-tree-sha1 = "8489905bcdbcfac64d1daa51ca07c0d8f0283821"
119+
git-tree-sha1 = "7d2f8f21da5db6a806faf7b9b292296da42b2810"
27120
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
28-
version = "2.8.1"
121+
version = "2.8.3"
122+
123+
[[deps.Pkg]]
124+
deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "Random", "SHA", "TOML", "Tar", "UUIDs", "p7zip_jll"]
125+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
126+
version = "1.11.0"
127+
128+
[deps.Pkg.extensions]
129+
REPLExt = "REPL"
130+
131+
[deps.Pkg.weakdeps]
132+
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
29133

30134
[[deps.PrecompileTools]]
31135
deps = ["Preferences"]
32-
git-tree-sha1 = "03b4c25b43cb84cee5c90aa9b5ea0a78fd848d2f"
136+
git-tree-sha1 = "5aa36f7049a63a1528fe8f7c3f2113413ffd4e1f"
33137
uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
34-
version = "1.2.0"
138+
version = "1.2.1"
35139

36140
[[deps.Preferences]]
37141
deps = ["TOML"]
38-
git-tree-sha1 = "00805cd429dcb4870060ff49ef443486c262e38e"
142+
git-tree-sha1 = "0f27480397253da18fe2c12a4ba4eb9eb208bf3d"
39143
uuid = "21216c6a-2e73-6563-6e65-726566657250"
40-
version = "1.4.1"
144+
version = "1.5.0"
41145

42146
[[deps.Printf]]
43147
deps = ["Unicode"]
44148
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
149+
version = "1.11.0"
45150

46151
[[deps.Random]]
47-
deps = ["SHA", "Serialization"]
152+
deps = ["SHA"]
48153
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
154+
version = "1.11.0"
49155

50156
[[deps.SHA]]
51157
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
52158
version = "0.7.0"
53159

54160
[[deps.Serialization]]
55161
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
162+
version = "1.11.0"
56163

57164
[[deps.Sockets]]
58165
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
166+
version = "1.11.0"
167+
168+
[[deps.TLSStreams]]
169+
deps = ["MbedTLS", "Sockets"]
170+
git-tree-sha1 = "d338ed421b802cc65a44e0bac4be8192537ab0d2"
171+
uuid = "94274baf-45e9-4e40-af20-2f884efab5aa"
172+
version = "0.1.1"
59173

60174
[[deps.TOML]]
61175
deps = ["Dates"]
62176
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
63177
version = "1.0.3"
64178

179+
[[deps.Tar]]
180+
deps = ["ArgTools", "SHA"]
181+
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
182+
version = "1.10.0"
183+
65184
[[deps.UUIDs]]
66185
deps = ["Random", "SHA"]
67186
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
187+
version = "1.11.0"
68188

69189
[[deps.Unicode]]
70190
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
191+
version = "1.11.0"
192+
193+
[[deps.Zlib_jll]]
194+
deps = ["Libdl"]
195+
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
196+
version = "1.2.13+1"
197+
198+
[[deps.nghttp2_jll]]
199+
deps = ["Artifacts", "Libdl"]
200+
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
201+
version = "1.59.0+0"
202+
203+
[[deps.p7zip_jll]]
204+
deps = ["Artifacts", "Libdl"]
205+
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
206+
version = "17.4.0+2"

‎test/jobenvs/job-dist/Project.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[deps]
2-
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
32
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
3+
JuliaHubDistributed = "ac0873db-f1c6-408a-a97a-f3c80a675215"
4+
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"

‎test/jobenvs/job-dist/script.jl‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using Distributed, JSON
1+
using Distributed, JSON, JuliaHubDistributed
2+
3+
JuliaHubDistributed.start()
4+
JuliaHubDistributed.wait_for_workers()
5+
26
@everywhere using Distributed
37
@everywhere fn() = (myid(), strip(read(`hostname`, String)))
48
fs = [i => remotecall(fn, i) for i in workers()]
@@ -8,3 +12,8 @@ vs = map(fs) do (i, future)
812
(; myid, hostname)
913
end
1014
ENV["RESULTS"] = JSON.json((; vs))
15+
if haskey(ENV, "JULIAHUB_RESULTS_SUMMARY_FILE")
16+
open(ENV["JULIAHUB_RESULTS_SUMMARY_FILE"], "w") do io
17+
write(io, ENV["RESULTS"])
18+
end
19+
end

‎test/jobenvs/job-exposed-port/server.jl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,9 @@ serve(; host="0.0.0.0", port=PORT)
3030

3131
@info "Exiting the server"
3232
ENV["RESULTS"] = results_json()
33+
if haskey(ENV, "JULIAHUB_RESULTS_SUMMARY_FILE")
34+
open(ENV["JULIAHUB_RESULTS_SUMMARY_FILE"], "w") do io
35+
write(io, ENV["RESULTS"])
36+
end
37+
end
3338
println(ENV["RESULTS"])

‎test/jobenvs/job1/script.jl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,8 @@ results = Dict(
3434

3535
@info "Storing RESULTS:\n$(results)"
3636
ENV["RESULTS"] = JSON.json(results)
37+
if haskey(ENV, "JULIAHUB_RESULTS_SUMMARY_FILE")
38+
open(ENV["JULIAHUB_RESULTS_SUMMARY_FILE"], "w") do io
39+
write(io, ENV["RESULTS"])
40+
end
41+
end

‎test/jobenvs/sysimage/script.jl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,9 @@ ENV["RESULTS"] = """
1616
"hello": "$(hello)"
1717
}
1818
"""
19+
if haskey(ENV, "JULIAHUB_RESULTS_SUMMARY_FILE")
20+
open(ENV["JULIAHUB_RESULTS_SUMMARY_FILE"], "w") do io
21+
write(io, ENV["RESULTS"])
22+
end
23+
end
1924
@info ENV["RESULTS"]

‎test/jobs-applications-live.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ DEFAULT_IDE_NAME = get(ENV, "JULIAHUBJL_LIVE_IDE_NAME", "Julia IDE")
1010
@test job.status == "Running"
1111
job = JuliaHub.kill_job(job)
1212
job = JuliaHub.wait_job(job)
13-
@test job.status == "Stopped"
13+
@test test_job_done_and_not_failed(job, "Stopped")
1414
end

0 commit comments

Comments
 (0)