@@ -149,26 +149,42 @@ def test_download_study(self):
149
149
self .assertEqual (response .code , 200 )
150
150
151
151
exp = (
152
- '\- \d+ /protected/processed_data/1_study_1001_closed_reference_otu_table.biom processed_data/1_study_1001_closed_reference_otu_table.biom\n '
153
- '\- \d+ /protected/templates/1_prep_1_\d\d\d\d\d\d\d\d-\d\d\d\d\d\d.txt mapping_files/\d_mapping_file.txt\n '
154
- '\- \d+ /protected/processed_data/1_study_1001_closed_reference_otu_table.biom processed_data/1_study_1001_closed_reference_otu_table.biom\n '
155
- '\- \d+ /protected/templates/1_prep_1_\d\d\d\d\d\d\d\d-\d\d\d\d\d\d.txt mapping_files/\d_mapping_file.txt\n '
156
- '\- \d+ /protected/processed_data/1_study_1001_closed_reference_otu_table_Silva.biom processed_data/1_study_1001_closed_reference_otu_table_Silva.biom\n '
157
- '\- \d+ /protected/templates/1_prep_1_\d\d\d\d\d\d\d\d-\d\d\d\d\d\d.txt mapping_files/6_mapping_file.txt\n '
158
- '\- \d+ /protected/BIOM/7/biom_table.biom BIOM/7/biom_table.biom\n '
159
- '\- \d+ /protected/templates/1_prep_2_\d\d\d\d\d\d\d\d-\d\d\d\d\d\d.txt mapping_files/7_mapping_file.txt\n '
160
- '\- \d+ /protected/BIOM/10/otu_table.biom BIOM/10/otu_table.biom\n '
161
- '\- \d+ /protected/BIOM/10/sortmerna_picked_otus/seqs_otus.log BIOM/10/sortmerna_picked_otus/seqs_otus.log\n '
162
- '\- \d+ /protected/templates/1_prep_1_\d\d\d\d\d\d\d\d-\d\d\d\d\d\d.txt mapping_files/10_mapping_file.txt\n '
152
+ '\- \d+ /protected/processed_data/'
153
+ '1_study_1001_closed_reference_otu_table.biom processed_data/'
154
+ '1_study_1001_closed_reference_otu_table.biom\n '
155
+ '\- \d+ /protected/templates/'
156
+ '1_prep_1_\d\d\d\d\d\d\d\d-\d\d\d\d\d\d.txt '
157
+ 'mapping_files/\d_mapping_file.txt\n '
158
+ '\- \d+ /protected/processed_data/'
159
+ '1_study_1001_closed_reference_otu_table.biom '
160
+ 'processed_data/1_study_1001_closed_reference_otu_table.biom\n '
161
+ '\- \d+ /protected/templates/'
162
+ '1_prep_1_\d\d\d\d\d\d\d\d-\d\d\d\d\d\d.txt mapping_files/'
163
+ '\d_mapping_file.txt\n '
164
+ '\- \d+ /protected/processed_data/'
165
+ '1_study_1001_closed_reference_otu_table_Silva.biom '
166
+ 'processed_data/'
167
+ '1_study_1001_closed_reference_otu_table_Silva.biom\n '
168
+ '\- \d+ /protected/templates/'
169
+ '1_prep_1_\d\d\d\d\d\d\d\d-\d\d\d\d\d\d.txt '
170
+ 'mapping_files/6_mapping_file.txt\n '
171
+ '\- \d+ /protected/BIOM/7/biom_table.biom BIOM/7/'
172
+ 'biom_table.biom\n '
173
+ '\- \d+ /protected/templates/'
174
+ '1_prep_2_\d\d\d\d\d\d\d\d-\d\d\d\d\d\d.txt '
175
+ 'mapping_files/7_mapping_file.txt\n '
176
+ '\- \d+ /protected/BIOM/10/otu_table.biom '
177
+ 'BIOM/10/otu_table.biom\n '
178
+ '\- \d+ /protected/BIOM/10/sortmerna_picked_otus/seqs_otus.log '
179
+ 'BIOM/10/sortmerna_picked_otus/seqs_otus.log\n '
180
+ '\- \d+ /protected/templates/'
181
+ '1_prep_1_\d\d\d\d\d\d\d\d-\d\d\d\d\d\d.txt '
182
+ 'mapping_files/10_mapping_file.txt\n '
163
183
)
164
184
165
185
obs = response .body .decode ('ascii' )
166
- with open ('A' , 'w' ) as f :
167
- f .write ("%s\n " % obs )
168
- with open ('B' , 'w' ) as f :
169
- f .write ("%s\n " % exp )
170
186
171
- self .assertRegex (response . body . decode ( 'ascii' ) , exp )
187
+ self .assertRegex (obs , exp )
172
188
173
189
response = self .get ('/download_study_bioms/200' )
174
190
self .assertEqual (response .code , 405 )
0 commit comments