Skip to content

Commit 3d1a2b8

Browse files
authored
Merge pull request #3 from unique-identifier/rm-pt-generate-files-from-sample-update2
Rm pt generate files from sample update2
2 parents 4ab0763 + b1a6209 commit 3d1a2b8

File tree

1 file changed

+37
-25
lines changed

1 file changed

+37
-25
lines changed

qiita_pet/test/test_download.py

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -147,32 +147,44 @@ def test_download_study(self):
147147

148148
response = self.get('/download_study_bioms/1')
149149
self.assertEqual(response.code, 200)
150-
exp = (
151-
'- 1256812 /protected/processed_data/'
152-
'1_study_1001_closed_reference_otu_table.biom processed_data/'
153-
'1_study_1001_closed_reference_otu_table.biom\n'
154-
'- [0-9]* /protected/templates/1_prep_1_qiime_19700101-000000.txt '
155-
'mapping_files/4_mapping_file.txt\n'
156-
'- 1256812 /protected/processed_data/'
157-
'1_study_1001_closed_reference_otu_table.biom processed_data/'
158-
'1_study_1001_closed_reference_otu_table.biom\n'
159-
'- [0-9]* /protected/templates/1_prep_1_qiime_19700101-000000.txt '
160-
'mapping_files/5_mapping_file.txt\n'
161-
'- 1256812 /protected/processed_data/1_study_1001_'
162-
'closed_reference_otu_table_Silva.biom processed_data/'
163-
'1_study_1001_closed_reference_otu_table_Silva.biom\n'
164-
'- [0-9]* /protected/templates/1_prep_1_qiime_19700101-000000.txt '
165-
'mapping_files/6_mapping_file.txt\n'
166-
'- 1093210 /protected/BIOM/7/biom_table.biom '
167-
'BIOM/7/biom_table.biom\n'
168-
'- [0-9]* /protected/BIOM/{0}/otu_table.biom '
169-
'BIOM/{0}/otu_table.biom\n'
170-
'- 1 /protected/BIOM/10/sortmerna_picked_otus/seqs_otus.log '
171-
'BIOM/{0}/sortmerna_picked_otus/seqs_otus.log\n'
172-
'- [0-9]* /protected/templates/1_prep_1_qiime_19700101-000000.txt '
173-
'mapping_files/{0}_mapping_file.txt\n'.format(a.id))
174150

175-
self.assertRegex(response.body.decode('ascii'), exp[10])
151+
exp = (
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'
183+
)
184+
185+
obs = response.body.decode('ascii')
186+
187+
self.assertRegex(obs, exp)
176188

177189
response = self.get('/download_study_bioms/200')
178190
self.assertEqual(response.code, 405)

0 commit comments

Comments
 (0)