Skip to content

Commit 7eba128

Browse files
josenavasantgonza
authored andcommitted
Giving enough time for the plugins to register (#17)
* Giving enough time for the plugins to register * Fixing travis * Removing the docs building * Giving a bit more time
1 parent 53a7b6a commit 7eba128

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ before_install:
1111
# Update conda itself
1212
- conda update --yes conda
1313
install:
14-
- travis_retry conda create --yes -n qiita_env python=2.7 pip nose flake8
14+
- travis_retry conda create --yes -n qiita python=2.7 pip nose flake8
1515
pyzmq networkx pyparsing natsort mock future libgfortran
1616
'pandas>=0.18' 'scipy>0.13.0' 'numpy>=1.7' 'h5py>=2.3.1'
17-
- source activate qiita_env
17+
- source activate qiita
1818
- pip install sphinx==1.5.5 sphinx-bootstrap-theme coveralls ipython[all]==2.4.1
1919
- pip install https://github.com/biocore/qiita/archive/analysis-refactor.zip --process-dependency-links
20-
- export QIITA_SERVER_CERT=$HOME/miniconda3/envs/qiita_env/lib/python2.7/site-packages/qiita_core/support_files/server.crt
21-
- export MOI_CONFIG_FP=$HOME/miniconda3/envs/qiita_env/lib/python2.7/site-packages/qiita_core/support_files/config_test.cfg
20+
- export QIITA_SERVER_CERT=$HOME/miniconda3/envs/qiita/lib/python2.7/site-packages/qiita_core/support_files/server.crt
21+
- export MOI_CONFIG_FP=$HOME/miniconda3/envs/qiita/lib/python2.7/site-packages/qiita_core/support_files/config_test.cfg
2222
- ipython profile create qiita-general --parallel
2323
- qiita-env start_cluster qiita-general
2424
- qiita-env make --no-load-ontologies
@@ -27,8 +27,8 @@ install:
2727
- source activate env_name
2828
- travis_retry pip install .
2929
before_script:
30-
- source activate qiita_env
31-
- qiita pet webserver start &
30+
- source activate qiita
31+
- qiita pet webserver --no-build-docs start &
3232
script:
3333
- source activate env_name
3434
- sleep 5 # give enough time to the webserver to start

qiita_client/testing.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ def setUpClass(cls):
2424
cls.client_secret,
2525
server_cert=cls.server_cert)
2626
cls.qclient.post('/apitest/reload_plugins/')
27+
# Give enough time for the plugins to register
28+
sleep(3)
2729

2830
@classmethod
2931
def tearDownClass(cls):
@@ -48,7 +50,7 @@ def _wait_for_running_job(self, job_id):
4850
This function only polls for five seconds. After those five seconds,
4951
it returns whatever the last seen status for the given job
5052
"""
51-
for i in range(10):
53+
for i in range(20):
5254
sleep(0.5)
5355
status = self.qclient.get_job_info(job_id)['status']
5456
if status != 'running':

0 commit comments

Comments
 (0)