Skip to content

Commit

Permalink
adding config_test.cfg.enc
Browse files Browse the repository at this point in the history
  • Loading branch information
antgonza committed Jul 1, 2018
1 parent b96d937 commit cc7544a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -4,7 +4,6 @@ sudo: false
env:
global:
- PYTHON_VERSION=3.5
- secure: "ZRCSJe2u1T7LtcKmy0jy8L1IdX4KIgwM79vm8/ZAjq4bfcNDjJu3mBsFy0sPx4A91abfZeG2vgp0D3/sWfrXzRvxcXv983lhvfgc0UL3ZOuCwl8cpNreH75AC+Z2zjohrq9wNmZQNCYd89xmkybzY9tS0d6UAFrh4Dh39FiYtDU="
matrix:
- TEST_ADD_STUDIES=False COVER_PACKAGE=qiita_db
- TEST_ADD_STUDIES=False COVER_PACKAGE=qiita_pet
Expand Down Expand Up @@ -70,6 +69,7 @@ script:
- qiita pet webserver --no-build-docs start &
- sleep 5
- QIITA_PID=$!
- if [ ${TRAVIS_PULL_REQUEST} == "false" ]; then openssl aes-256-cbc -K $encrypted_bcdc06e5ae76_key -iv $encrypted_bcdc06e5ae76_iv -in qiita_core/support_files/config_test.cfg.enc -out qiita_core/support_files/config_test.cfg -d ; fi
- nosetests $COVER_PACKAGE --with-doctest --with-coverage --with-timer -v --cover-package=$COVER_PACKAGE
- kill $QIITA_PID
- if [ ${TEST_ADD_STUDIES} == "True" ]; then test_data_studies/commands.sh ; fi
Expand Down
Binary file added qiita_core/support_files/config_test.cfg.enc
Binary file not shown.
6 changes: 3 additions & 3 deletions qiita_ware/test/test_commands.py
Expand Up @@ -8,7 +8,6 @@
# The full license is in the file LICENSE, distributed with this software.
# -----------------------------------------------------------------------------
from unittest import TestCase, main, skipIf
from os import environ
from os.path import join
from tempfile import mkdtemp
import pandas as pd
Expand All @@ -28,6 +27,7 @@
from qiita_db.metadata_template.sample_template import SampleTemplate
from qiita_db.user import User
from qiita_core.util import qiita_test_checker
from qiita_core.qiita_settings import qiita_config


@qiita_test_checker()
Expand Down Expand Up @@ -147,7 +147,7 @@ def test_submit_EBI_step_2_failure(self):
rmtree(join(self.base_fp, '%d_ebi_submission' % pid), True)

@skipIf(
environ.get('ASPERA_SCP_PASS', '') == '', 'skip: ascp not configured')
qiita_config.ebi_seq_xfer_pass == '', 'skip: ascp not configured')
def test_submit_EBI_parse_EBI_reply_failure(self):
ppd = self.write_demux_files(PrepTemplate(1))
pid = ppd.id
Expand All @@ -161,7 +161,7 @@ def test_submit_EBI_parse_EBI_reply_failure(self):
rmtree(join(self.base_fp, '%d_ebi_submission' % pid), True)

@skipIf(
environ.get('ASPERA_SCP_PASS', '') == '', 'skip: ascp not configured')
qiita_config.ebi_seq_xfer_pass == '', 'skip: ascp not configured')
def test_full_submission(self):
artifact = self.generate_new_study_with_preprocessed_data()
self.assertEqual(
Expand Down

0 comments on commit cc7544a

Please sign in to comment.