@@ -154,12 +154,17 @@ class TestLoadProcessedDataFromCmd(TestCase):
154
154
def setUp (self ):
155
155
fd , self .otu_table_fp = mkstemp (suffix = '_otu_table.biom' )
156
156
close (fd )
157
+ fd , self .otu_table_2_fp = mkstemp (suffix = '_otu_table2.biom' )
158
+ close (fd )
157
159
158
160
with open (self .otu_table_fp , "w" ) as f :
159
161
f .write ("\n " )
162
+ with open (self .otu_table_2_fp , "w" ) as f :
163
+ f .write ("\n " )
160
164
161
165
self .files_to_remove = []
162
166
self .files_to_remove .append (self .otu_table_fp )
167
+ self .files_to_remove .append (self .otu_table_2_fp )
163
168
164
169
self .db_test_processed_data_dir = join (get_db_files_base_dir (),
165
170
'processed_data' )
@@ -170,8 +175,8 @@ def tearDown(self):
170
175
remove (fp )
171
176
172
177
def test_load_processed_data_from_cmd (self ):
173
- filepaths = [self .otu_table_fp ]
174
- filepath_types = ['biom' ]
178
+ filepaths = [self .otu_table_fp , self . otu_table_2_fp ]
179
+ filepath_types = ['biom' , 'biom' ]
175
180
176
181
initial_processed_data_count = get_count ('qiita.processed_data' )
177
182
initial_processed_fp_count = get_count ('qiita.processed_filepath' )
@@ -183,19 +188,23 @@ def test_load_processed_data_from_cmd(self):
183
188
self .files_to_remove .append (
184
189
join (self .db_test_processed_data_dir ,
185
190
'%d_%s' % (processed_data_id , basename (self .otu_table_fp ))))
191
+ self .files_to_remove .append (
192
+ join (self .db_test_processed_data_dir ,
193
+ '%d_%s' % (processed_data_id ,
194
+ basename (self .otu_table_2_fp ))))
186
195
187
196
self .assertTrue (check_count ('qiita.processed_data' ,
188
197
initial_processed_data_count + 1 ))
189
198
self .assertTrue (check_count ('qiita.processed_filepath' ,
190
- initial_processed_fp_count + 1 ))
199
+ initial_processed_fp_count + 2 ))
191
200
self .assertTrue (check_count ('qiita.filepath' ,
192
- initial_fp_count + 1 ))
201
+ initial_fp_count + 2 ))
193
202
194
203
# Ensure that the ValueError is raised when a filepath_type is not
195
204
# provided for each and every filepath
196
205
with self .assertRaises (ValueError ):
197
- load_processed_data_cmd (filepaths , [], 'processed_params_uclust' ,
198
- 1 , 1 , None )
206
+ load_processed_data_cmd (filepaths , filepath_types [: - 1 ] ,
207
+ 'processed_params_uclust' , 1 , 1 , None )
199
208
200
209
201
210
CONFIG_1 = """[required]
0 commit comments