Skip to content

Commit a688908

Browse files
committed
use a more simple request to determine base_data_dir
1 parent 6e5ed91 commit a688908

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

qiita_client/testing.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ def setUpClass(cls):
4545
cls.qclient._plugincoupling = environ.get(
4646
'QIITA_PLUGINCOUPLING', BaseQiitaPlugin._DEFAULT_PLUGIN_COUPLINGS)
4747

48-
# use artifact 1 info to determine BASA_DATA_DIR, as we know that the
49-
# filepath ends with ....raw_data/1_s_G1_L001_sequences.fastq.gz, thus
50-
# BASE_DATA_DIR must be the prefix, e.g. /qiita_data/
48+
# Determine BASE_DATA_DIR of qiita central, without having direct
49+
# access to qiita's settings file. This is done by requesting
50+
# information about prep 1, which should be in the test database.
5151
# This might break IF file
5252
# qiita-spots/qiita/qiita_db/support_files/populate_test_db.sql
5353
# changes.
54-
ainfo = cls.qclient.get('/qiita_db/artifacts/1/')
55-
cls.base_data_dir = ainfo['files']['raw_forward_seqs'][0]['filepath'][
56-
:(-1 * len('raw_data/1_s_G1_L001_sequences.fastq.gz'))]
54+
prep_info = cls.qclient.get('/qiita_db/prep_template/1/',
55+
no_file_fetching=True)
56+
cls.base_data_dir = prep_info['prep-file'].split('templates/')[0]
5757

5858
# Give enough time for the plugins to register
5959
sleep(5)

0 commit comments

Comments
 (0)