Skip to content

Commit 944106b

Browse files
Drop ECCODarwin tests (#637)
* bugfix * check if the holdup is the downloading * exclude darwin dataset
1 parent 3b21c50 commit 944106b

File tree

2 files changed

+53
-46
lines changed

2 files changed

+53
-46
lines changed

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if test_group == :init || test_group == :all
6363
download_dataset(salinity_metadata)
6464

6565
if dataset isa Union{ECCO2DarwinMonthly, ECCO4DarwinMonthly}
66-
PO₄_metadata = Metadata(:PO₄; dataset, dates)
66+
PO₄_metadata = Metadata(:phosphate; dataset, dates)
6767
download_dataset(PO₄_metadata)
6868
end
6969
end

test/test_ecco2_monthly.jl

Lines changed: 52 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -22,59 +22,66 @@ start_date = DateTime(1993, 1, 1)
2222
for arch in test_architectures, dataset in test_ecco_datasets
2323
A = typeof(arch)
2424
D = typeof(dataset)
25-
@testset "$A metadata tests for $D" begin
26-
@info "Running Metadata tests for $D on $A..."
2725

28-
time_resolution = dataset isa ECCO2Daily ? Day(1) : Month(1)
29-
end_date = start_date + 4 * time_resolution
30-
dates = start_date : time_resolution : end_date
31-
32-
@testset "Fields utilities" begin
33-
for name in test_names[dataset]
34-
metadata = Metadata(name; dates, dataset)
35-
36-
download_dataset(metadata) # just in case is not downloaded
37-
for datum in metadata
38-
@test isfile(metadata_path(datum))
26+
if dataset isa ECCO2DarwinMonthly
27+
@info "Skipping tests because of failure (see https://github.com/CliMA/ClimaOcean.jl/issues/636)"
28+
else
29+
@testset "$A metadata tests for $D" begin
30+
@info "Running Metadata tests for $D on $A..."
31+
32+
time_resolution = dataset isa ECCO2Daily ? Day(1) : Month(1)
33+
end_date = start_date + 4 * time_resolution
34+
dates = start_date : time_resolution : end_date
35+
36+
@testset "Fields utilities" begin
37+
for name in test_names[dataset]
38+
metadata = Metadata(name; dates, dataset)
39+
40+
@show "I am downloading the dataset"
41+
download_dataset(metadata) # just in case is not downloaded
42+
@show "dataset downloaded"
43+
for datum in metadata
44+
@test isfile(metadata_path(datum))
45+
end
46+
47+
datum = first(metadata)
48+
ψ = Field(datum, arch, inpainting=NearestNeighborInpainting(2))
49+
@test ψ isa Field
50+
datapath = ClimaOcean.DataWrangling.inpainted_metadata_path(datum)
51+
@test isfile(datapath)
3952
end
40-
41-
datum = first(metadata)
42-
ψ = Field(datum, arch, inpainting=NearestNeighborInpainting(2))
43-
@test ψ isa Field
44-
datapath = ClimaOcean.DataWrangling.inpainted_metadata_path(datum)
45-
@test isfile(datapath)
4653
end
47-
end
4854

49-
@testset "Setting a field from a dataset" begin
50-
test_setting_from_metadata(arch, dataset, start_date, inpainting,
51-
varnames=test_names[dataset])
52-
end
55+
@testset "Setting a field from a dataset" begin
56+
test_setting_from_metadata(arch, dataset, start_date, inpainting,
57+
varnames=test_names[dataset])
58+
end
5359

54-
@testset "Field utilities" begin
55-
test_ocean_metadata_utilities(arch, dataset, dates, inpainting,
56-
varnames=test_names[dataset])
57-
end
60+
@testset "Field utilities" begin
61+
test_ocean_metadata_utilities(arch, dataset, dates, inpainting,
62+
varnames=test_names[dataset])
63+
end
5864

59-
@testset "DatasetRestoring with LinearlyTaperedPolarMask" begin
60-
test_dataset_restoring(arch, dataset, dates, inpainting,
61-
varnames=test_names[dataset],
62-
fldnames=test_fields[dataset])
63-
end
65+
@testset "DatasetRestoring with LinearlyTaperedPolarMask" begin
66+
test_dataset_restoring(arch, dataset, dates, inpainting,
67+
varnames=test_names[dataset],
68+
fldnames=test_fields[dataset])
69+
end
6470

65-
@testset "Timestepping with DatasetRestoring" begin
66-
test_timestepping_with_dataset_restoring(arch, dataset, dates, inpainting,
67-
varnames=test_names[dataset],
68-
fldnames=test_fields[dataset])
69-
end
71+
@testset "Timestepping with DatasetRestoring" begin
72+
test_timestepping_with_dataset_restoring(arch, dataset, dates, inpainting,
73+
varnames=test_names[dataset],
74+
fldnames=test_fields[dataset])
75+
end
7076

71-
# @testset "Dataset cycling boundaries" begin
72-
# test_cycling_dataset_restoring(arch, dataset, dates, inpainting)
73-
# end
77+
# @testset "Dataset cycling boundaries" begin
78+
# test_cycling_dataset_restoring(arch, dataset, dates, inpainting)
79+
# end
7480

75-
# Expensive due to the high resolution of ECCO2
76-
# @testset "Inpainting algorithm" begin
77-
# test_inpainting_algorithm(arch, dataset, start_date, inpainting)
78-
# end
81+
# Expensive due to the high resolution of ECCO2
82+
# @testset "Inpainting algorithm" begin
83+
# test_inpainting_algorithm(arch, dataset, start_date, inpainting)
84+
# end
85+
end
7986
end
8087
end

0 commit comments

Comments
 (0)