diff --git a/test/runtests-live.jl b/test/runtests-live.jl index 11f72503a..371f758ca 100644 --- a/test/runtests-live.jl +++ b/test/runtests-live.jl @@ -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 @@ -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 diff --git a/test/runtests.jl b/test/runtests.jl index 4a33cc921..80f9a1d60 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -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 """ @@ -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"]) @@ -139,9 +132,6 @@ 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) @@ -149,22 +139,6 @@ end @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"]