Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/runtests-live.jl
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ end
include("datasets-large-live.jl")
end

is_enabled("datasets-projects"; disabled_by_default=true) &&
is_enabled("datasets-projects") &&
@testset "Project-dataset integration" begin
include("projects-live.jl")
end
Expand All @@ -73,7 +73,7 @@ end
include("jobs-live.jl")
end

is_enabled("jobs-exposed-port"; disabled_by_default=true) &&
is_enabled("jobs-exposed-port") &&
@testset "Exposed ports" begin
include("jobs-exposed-port-live.jl")
end
Expand Down
26 changes: 0 additions & 26 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ function extra_enabled_live_tests(; print_info=false)
if get(ENV, "JULIAHUBJL_LIVE_WINDOWS_TESTS", "") == "true"
push!(testnames, "jobs-windows")
end
if get(ENV, "JULIAHUBJL_LIVE_EXPOSED_PORT_TESTS", "") == "true"
push!(testnames, "jobs-exposed-port")
end
if get(ENV, "JULIAHUBJL_LIVE_PROJECTS_TESTS", "") == "true"
push!(testnames, "datasets-projects")
end
if print_info && !isempty(testnames)
testname_list = join(string.(" - ", testnames), '\n')
@info """
Expand Down Expand Up @@ -115,7 +109,6 @@ end
# in case it is set in the actual enviornment.
withenv(
"JULIAHUBJL_LIVE_WINDOWS_TESTS" => nothing,
"JULIAHUBJL_LIVE_EXPOSED_PORT_TESTS" => nothing,
) do
@test !is_enabled(; args=[])
@test is_enabled(; args=["--live"])
Expand All @@ -139,32 +132,13 @@ end
@test_logs (:warn,) @test !is_enabled(
"jobs-windows"; args, disabled_by_default=true
)
@test_logs (:warn,) @test !is_enabled(
"jobs-exposed-port"; args, disabled_by_default=true
)
end
withenv("JULIAHUBJL_LIVE_WINDOWS_TESTS" => "true") do
@test_logs (:info,) @test is_enabled("datasets"; args)
@test_logs (:info,) @test is_enabled("jobs"; args)
@test_logs (:info,) @test is_enabled(
"jobs-windows"; args, disabled_by_default=true
)
@test_logs (:warn,) @test !is_enabled(
"jobs-exposed-port"; args, disabled_by_default=true
)
end
withenv(
"JULIAHUBJL_LIVE_WINDOWS_TESTS" => "true",
"JULIAHUBJL_LIVE_EXPOSED_PORT_TESTS" => "true",
) do
@test_logs (:info,) @test is_enabled("datasets"; args)
@test_logs (:info,) @test is_enabled("jobs"; args)
@test_logs (:info,) @test is_enabled(
"jobs-windows"; args, disabled_by_default=true
)
@test_logs (:info,) @test is_enabled(
"jobs-exposed-port"; args, disabled_by_default=true
)
end
end
let args = ["datasets", "jobs"]
Expand Down
Loading