Skip to content

Commit 4570736

Browse files
committed
bugfix(ecotaxa/ecotaxa#42): exports split by taxon were incomplete for those containing a <
1 parent 5a7d776 commit 4570736

File tree

13 files changed

+57
-30
lines changed

13 files changed

+57
-30
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
object_id object_extra object_lat object_lon object_date object_time object_link object_depth_min object_depth_max object_annotation_status object_annotation_person_name object_annotation_person_email object_annotation_date object_annotation_time object_annotation_category object_annotation_category_id img_file_name img_rank object_by object_width object_height object_area object_mean object_major object_minor object_feret object_area_exc object_thickr object_esd object_elongation object_range object_meanpos object_centroids object_cv object_sr object_perimareaexc object_feretareaexc object_perimferet object_perimmajor object_circex object_cdexc object_kurt_mean object_skew_mean object_convperim_perim object_convarea_area object_symetrieh_area object_symetriev_area object_nb1_area object_nb2_area object_nb3_area object_nb1_range object_nb2_range object_nb3_range object_median_mean object_median_mean_range object_skeleton_area sample_id sample_dataportal_descriptor sample_project sample_ship sample_filename sample_samplinggear sample_volconc sample_comment sample_tot_vol process_id process_software process_start_date process_start_time process_analysed_color_channel process_background_method process_nb_images process_rolling process_pixel process_upper process_gamma_value process_vignette_color process_esd_min process_esd_max process_lut_offset process_lut_slope process_remove_objects_on_sides process_stop_n_images process_scale process_stop_after_m_objects process_nb_of_rawfile_images_in_folder process_grey_auto_adjust acq_id acq_instrument acq_cell_type acq_magnification acq_sub_part
2+
[t] [t] [f] [f] [t] [t] [t] [f] [f] [t] [t] [t] [t] [t] [t] [t] [t] [t] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [f] [t] [t] [t] [t] [t] [t] [t] [t] [f] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [t] [f]
3+
m106_mn01_n3_sml_1112 Extra4 18.0 -24.4166666666667 20140421 420 300.0 600.0 predicted Elizandro Rodriguez elizandro.rodrigues05@gmail.com 20151111 153101 small<egg 92731 m106_mn01_n3_sml_1112.jpg 10961.0 23.0 28.0 490.0 210.800003051758 27.0 23.1000003814697 29.2000007629395 0.0 2.0 1.860 m106_mn01_n3_sml 2014_m106_sml meteor m106_mn01_n3_sml net 9.75 xx zooprocess_m106_mn01_n3_sml zooprocess_pid_to_ecotaxa_7.23_2017/03/10 20150829 2256 rolling_ball 2 20 10.6 245 2 b&w_no_background 200 1000 0 1 yes 1 2 generic_m106_mn01_n3_sml epson 200-500 1
1.89 KB
Loading

QA/py/data/ref_exports/tsv_all_entities_no_img_no_ids/ecotaxa_m106_mn01_n3_sml.tsv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
"m106_mn01_n3_sml_1" 18.0 -24.4166666666667 "2014-04-20" "04:20:00" "" 300.0 600.0 "predicted" "" "" "" "" "detritus" "living>detritus" "" 14.0 25.0 26.0 413.0 175.529998779297 24.7000007629395 21.2999992370605 27.2999992370605 0.0 2.0 "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra1" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" ""
33
"m106_mn01_n3_sml_1081" 18.0 -24.4166666666667 "2014-04-20" "04:20:00" "" 300.0 600.0 "predicted" "" "" "" "" "detritus" "living>detritus" "" 9940.0 56.0 38.0 929.0 222.75 44.2000007629395 26.7999992370605 58.2000007629395 9.0 1.86000001430511 "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra2" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" ""
44
"m106_mn01_n3_sml_1111" 18.0 -24.4166666666667 "2014-04-21" "04:20:00" "" 300.0 600.0 "predicted" "" "" "" "" "small<egg" "living>Eukaryota>Opisthokonta>Holozoa>Metazoa>Chordata>Craniata>Vertebrata>Gnathostomata>Actinopterygii>egg>small" "" 10961.0 23.0 28.0 490.0 210.800003051758 27.0 23.1000003814697 29.2000007629395 0.0 2.0 1.86 "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra3" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" ""
5+
"m106_mn01_n3_sml_1112" 18.0 -24.4166666666667 "2014-04-21" "04:20:00" "" 300.0 600.0 "predicted" "" "" "" "" "small<egg" "living>Eukaryota>Opisthokonta>Holozoa>Metazoa>Chordata>Craniata>Vertebrata>Gnathostomata>Actinopterygii>egg>small" "" 10961.0 23.0 28.0 490.0 210.800003051758 27.0 23.1000003814697 29.2000007629395 0.0 2.0 1.86 "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra4" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" ""

QA/py/data/ref_exports/tsv_by_acquisition/ecotaxa_generic_m106_mn01_n3_sml.tsv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
"generic_m106_mn01_n3_sml/m106_mn01_n3_sml_1081.jpg" 0 "m106_mn01_n3_sml_1081" 18.0 -24.4166666666667 "2014-04-20" "04:20:00" "" 300.0 600.0 "predicted" "" "" "" "" "detritus" "living>detritus" "" 9940.0 56.0 38.0 929.0 222.75 44.2000007629395 26.7999992370605 58.2000007629395 9.0 1.86000001430511 "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra2" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" ""
44
"generic_m106_mn01_n3_sml/m106_mn01_n3_sml_1111.jpg" 0 "m106_mn01_n3_sml_1111" 18.0 -24.4166666666667 "2014-04-21" "04:20:00" "" 300.0 600.0 "predicted" "" "" "" "" "small<egg" "living>Eukaryota>Opisthokonta>Holozoa>Metazoa>Chordata>Craniata>Vertebrata>Gnathostomata>Actinopterygii>egg>small" "" 10961.0 23.0 28.0 490.0 210.800003051758 27.0 23.1000003814697 29.2000007629395 0.0 2.0 1.86 "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra3" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" ""
55
"generic_m106_mn01_n3_sml/m106_mn01_n3_sml_1111_2.jpg" 2 "m106_mn01_n3_sml_1111" 18.0 -24.4166666666667 "2014-04-21" "04:20:00" "" 300.0 600.0 "predicted" "" "" "" "" "small<egg" "living>Eukaryota>Opisthokonta>Holozoa>Metazoa>Chordata>Craniata>Vertebrata>Gnathostomata>Actinopterygii>egg>small" "" 10961.0 23.0 28.0 490.0 210.800003051758 27.0 23.1000003814697 29.2000007629395 0.0 2.0 1.86 "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra3" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" ""
6+
"generic_m106_mn01_n3_sml/m106_mn01_n3_sml_1112.jpg" 0 "m106_mn01_n3_sml_1112" 18.0 -24.4166666666667 "2014-04-21" "04:20:00" "" 300.0 600.0 "predicted" "" "" "" "" "small<egg" "living>Eukaryota>Opisthokonta>Holozoa>Metazoa>Chordata>Craniata>Vertebrata>Gnathostomata>Actinopterygii>egg>small" "" 10961.0 23.0 28.0 490.0 210.800003051758 27.0 23.1000003814697 29.2000007629395 0.0 2.0 1.86 "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra4" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" ""
1.89 KB
Loading
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
"img_file_name" "img_rank" "object_id" "object_lat" "object_lon" "object_date" "object_time" "object_link" "object_depth_min" "object_depth_max" "object_annotation_status" "object_annotation_person_name" "object_annotation_person_email" "object_annotation_date" "object_annotation_time" "object_annotation_category" "object_annotation_hierarchy" "object_by" "object_width" "object_height" "object_area" "object_mean" "object_major" "object_minor" "object_feret" "object_area_exc" "object_thickr" "object_esd" "object_elongation" "object_range" "object_meanpos" "object_centroids" "object_cv" "object_sr" "object_perimareaexc" "object_feretareaexc" "object_perimferet" "object_perimmajor" "object_circex" "object_cdexc" "object_kurt_mean" "object_skew_mean" "object_convperim_perim" "object_convarea_area" "object_symetrieh_area" "object_symetriev_area" "object_nb1_area" "object_nb2_area" "object_nb3_area" "object_nb1_range" "object_nb2_range" "object_nb3_range" "object_median_mean" "object_median_mean_range" "object_skeleton_area" "object_extra" "sample_id" "sample_dataportal_descriptor" "sample_project" "sample_ship" "sample_filename" "sample_samplinggear" "sample_volconc" "sample_comment" "sample_tot_vol" "process_id" "process_software" "process_start_date" "process_start_time" "process_analysed_color_channel" "process_background_method" "process_nb_images" "process_rolling" "process_pixel" "process_upper" "process_gamma_value" "process_vignette_color" "process_esd_min" "process_esd_max" "process_lut_offset" "process_lut_slope" "process_remove_objects_on_sides" "process_stop_n_images" "process_scale" "process_stop_after_m_objects" "process_nb_of_rawfile_images_in_folder" "process_grey_auto_adjust" "acq_id" "acq_instrument" "acq_cell_type" "acq_magnification" "acq_sub_part"
22
"[t]" "[t]" "[t]" "[f]" "[f]" "[t]" "[t]" "[t]" "[f]" "[f]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[f]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]" "[t]"
33
"small_egg/m106_mn01_n3_sml_1111.jpg" 0 "m106_mn01_n3_sml_1111" 18.0 -24.4166666666667 "2014-04-21" "04:20:00" "" 300.0 600.0 "predicted" "" "" "" "" "small<egg" "living>Eukaryota>Opisthokonta>Holozoa>Metazoa>Chordata>Craniata>Vertebrata>Gnathostomata>Actinopterygii>egg>small" 10961.0 23.0 28.0 490.0 210.800003051758 27.0 23.1000003814697 29.2000007629395 0.0 2.0 1.86 "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra3" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" ""
4+
"small_egg/m106_mn01_n3_sml_1112.jpg" 0 "m106_mn01_n3_sml_1112" 18.0 -24.4166666666667 "2014-04-21" "04:20:00" "" 300.0 600.0 "predicted" "" "" "" "" "small<egg" "living>Eukaryota>Opisthokonta>Holozoa>Metazoa>Chordata>Craniata>Vertebrata>Gnathostomata>Actinopterygii>egg>small" 10961.0 23.0 28.0 490.0 210.800003051758 27.0 23.1000003814697 29.2000007629395 0.0 2.0 1.86 "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra4" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" ""
1.89 KB
Loading

QA/py/data/ref_exports/tsv_with_ids/ecotaxa_m106_mn01_n3_sml.tsv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
"m106_mn01_n3_sml_1" "18,0" "-24,4166666666667" "20140420" "042000" "" "300,0" "600,0" "predicted" "" "" "" "" "detritus" "living>detritus" "" "14,0" "25,0" "26,0" "413,0" "175,529998779297" "24,7000007629395" "21,2999992370605" "27,2999992370605" "0,0" "2,0" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra1" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" "" 11 3 3 3 84963 1 "" "living" "" "" 75443185 "N" "18,0" "-24,4166666666667"
33
"m106_mn01_n3_sml_1081" "18,0" "-24,4166666666667" "20140420" "042000" "" "300,0" "600,0" "predicted" "" "" "" "" "detritus" "living>detritus" "" "9940,0" "56,0" "38,0" "929,0" "222,75" "44,2000007629395" "26,7999992370605" "58,2000007629395" "9,0" "1,86000001430511" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra2" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" "" 12 3 3 3 84963 1 "" "living" "" "" 96906585 "N" "18,0" "-24,4166666666667"
44
"m106_mn01_n3_sml_1111" "18,0" "-24,4166666666667" "20140421" "042000" "" "300,0" "600,0" "predicted" "" "" "" "" "egg<other" "living>egg" "" "10961,0" "23,0" "28,0" "490,0" "210,800003051758" "27,0" "23,1000003814697" "29,2000007629395" "0,0" "2,0" "1,86" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra3" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" "" 13 3 3 3 85078 1 "" "living" "" "" 9141766 "N" "18,0" "-24,4166666666667"
5+
"m106_mn01_n3_sml_1112" "18,0" "-24,4166666666667" "20140421" "042000" "" "300,0" "600,0" "predicted" "" "" "" "" "egg<other" "living>egg" "" "10961,0" "23,0" "28,0" "490,0" "210,800003051758" "27,0" "23,1000003814697" "29,2000007629395" "0,0" "2,0" "1,86" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Extra4" "m106_mn01_n3_sml" "" "2014_m106_sml" "meteor" "m106_mn01_n3_sml" "net" "9.75" "xx" "" "zooprocess_m106_mn01_n3_sml" "zooprocess_pid_to_ecotaxa_7.23_2017/03/10" "20150829" "2256" "" "rolling_ball" "2" "20" "10.6" "245" "2" "b&w_no_background" "200" "1000" "0" "1" "yes" "" "1" "" "2" "" "generic_m106_mn01_n3_sml" "epson" "200-500" "1" "" 13 3 3 3 85078 1 "" "living" "" "" 9141766 "N" "18,0" "-24,4166666666667"

QA/py/tests/test_export.py

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,13 @@
3333
get_classif_history,
3434
)
3535
from tests.test_fastapi import PROJECT_QUERY_URL
36-
from tests.test_import import create_project, do_import, DATA_DIR, dump_project
36+
from tests.test_import import (
37+
create_project,
38+
do_import,
39+
DATA_DIR,
40+
dump_project,
41+
PLUS_MORE_DIR,
42+
)
3743
from tests.test_import_update import do_import_update
3844
from tests.test_subentities import current_object
3945
from tests.test_update_prj import PROJECT_UPDATE_URL
@@ -80,6 +86,26 @@ def test_export_tsv(database, fastapi, caplog):
8086
# Add a sample spanning 2 days
8187
test_import_a_bit_more_skipping(database, caplog, "TSV export project")
8288

89+
# Backup export, the output is reused in another test
90+
req_and_filters = {
91+
"filters": {},
92+
"request": {
93+
"project_id": prj_id,
94+
},
95+
}
96+
rsp = fastapi.post(
97+
OBJECT_SET_BACKUP_EXPORT_URL, headers=ADMIN_AUTH, json=req_and_filters
98+
)
99+
assert rsp.status_code == status.HTTP_200_OK
100+
101+
job_id = get_job_and_wait_until_ok(fastapi, rsp)
102+
download_and_unzip_and_check(fastapi, job_id, "bak_all_images")
103+
104+
# Add a complement of the new sample, for _several_ objects with composed taxon names
105+
test_import_a_bit_more_skipping(
106+
database, caplog, "TSV export project", str(PLUS_MORE_DIR)
107+
)
108+
83109
# Get the project for update
84110
url = PROJECT_QUERY_URL.format(project_id=prj_id, manage=True)
85111
rsp = fastapi.get(url, headers=ADMIN_AUTH)
@@ -100,21 +126,6 @@ def test_export_tsv(database, fastapi, caplog):
100126
job_id = get_job_and_wait_until_ok(fastapi, rsp)
101127
download_and_unzip_and_check(fastapi, job_id, "tsv_all_entities_no_img_no_ids")
102128

103-
# Backup export
104-
req_and_filters = {
105-
"filters": {},
106-
"request": {
107-
"project_id": prj_id,
108-
},
109-
}
110-
rsp = fastapi.post(
111-
OBJECT_SET_BACKUP_EXPORT_URL, headers=ADMIN_AUTH, json=req_and_filters
112-
)
113-
assert rsp.status_code == status.HTTP_200_OK
114-
115-
job_id = get_job_and_wait_until_ok(fastapi, rsp)
116-
download_and_unzip_and_check(fastapi, job_id, "bak_all_images")
117-
118129
# TSV export with IDs
119130
req_and_filters = {
120131
"filters": {},

QA/py/tests/test_export_emodnet.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def exportable_collection(database, fastapi, caplog, admin_or_creator):
115115
# Validate nearly everything, otherwise no export.
116116
obj_ids = query_all_objects(fastapi, CREATOR_AUTH, prj_id)
117117
assert len(obj_ids) == 20
118-
# The first Actinopterygii object in m106_mn01_n3_sml remains Predicted and the second one is imported Validated
118+
# The first Actinopterygii<egg<small object in m106_mn01_n3_sml remains Predicted, the second one is imported Validated
119119
actinopters = query_all_objects(fastapi, CREATOR_AUTH, prj_id, taxo="92731")
120120
assert len(actinopters) == 2
121121
for an_objid in actinopters: # No need to validate any of them
@@ -463,7 +463,9 @@ def unzip_and_check(zip_content, ref_content, who):
463463
print(file_content)
464464
print()
465465
# Add CRs before and after for readability of the py version
466-
all_in_one[name] = "\n" + file_content + "\n"
466+
file_content = "\n" + file_content + "\n"
467+
all_in_one[name] = file_content
468+
assert file_content == ref_content[name]
467469
assert all_in_one == ref_content
468470

469471

0 commit comments

Comments
 (0)