Skip to content

WIP: improve time for tests #2147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 19, 2017
Merged

WIP: improve time for tests #2147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
25f399b
adding timer
antgonza Jun 16, 2017
4d95a80
nose-timer to pip command
antgonza Jun 16, 2017
47d54df
active_children test
antgonza Jun 16, 2017
4a5f898
300000
antgonza Jun 18, 2017
9eff24a
multiprocessing->active_children
antgonza Jun 19, 2017
c245c04
2400000
antgonza Jun 19, 2017
82751f6
600000
antgonza Jun 19, 2017
c2086b7
Trying to fix the tests
josenavas Jun 19, 2017
4b17051
Submit the job on commit
josenavas Jun 19, 2017
cec7ca4
Reverting last change
josenavas Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ install:
'pandas>=0.18' 'matplotlib>=1.1.0' 'scipy>0.13.0' 'numpy>=1.7' 'h5py>=2.3.1'
- source activate qiita
- pip install -U pip
- pip install sphinx sphinx-bootstrap-theme coveralls 'ipython[all]==2.4.1'
- pip install sphinx sphinx-bootstrap-theme coveralls 'ipython[all]==2.4.1' nose-timer
- travis_retry pip install . --process-dependency-links
- 'echo "backend: Agg" > matplotlibrc'
# Install the biom plugin so we can run the analysis tests
Expand Down Expand Up @@ -56,7 +56,7 @@ script:
- if [ ${TEST_ADD_STUDIES} == "True" ]; then test_data_studies/commands.sh ; fi
- if [ ${TEST_ADD_STUDIES} == "True" ]; then qiita-cron-job ; fi
- if [ ${TEST_ADD_STUDIES} == "False" ]; then qiita-test-install ; fi
- if [ ${TEST_ADD_STUDIES} == "False" ]; then nosetests --with-doctest --with-coverage -v --cover-package=qiita_db,qiita_pet,qiita_core,qiita_ware; fi
- if [ ${TEST_ADD_STUDIES} == "False" ]; then nosetests --with-doctest --with-coverage --with-timer -v --cover-package=qiita_db,qiita_pet,qiita_core,qiita_ware; fi
- flake8 qiita_* setup.py scripts/*
- ls -R /home/travis/miniconda3/envs/qiita/lib/python2.7/site-packages/qiita_pet/support_files/doc/
- qiita pet webserver
Expand Down
6 changes: 4 additions & 2 deletions qiita_db/analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,10 @@ def create(cls, owner, name, description, from_default=False,
VALUES (%s, %s)"""
qdb.sql_connection.TRN.add(sql, [a_id, job.id])
qdb.sql_connection.TRN.execute()
job.submit()
return instance

# Doing the submission outside of the transaction
job.submit()
return instance

@classmethod
def delete(cls, _id):
Expand Down
3 changes: 2 additions & 1 deletion scripts/qiita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,8 @@ def start(port, master):
# Set a PeriodicCallback for cleaning up the threads every 10 seconds
# To understand why this is working as expected, check the multiprocessing
# documentation https://docs.python.org/2/library/multiprocessing.html
PeriodicCallback(lambda: active_children(), 10000).start()
# 600000 == 10 min
PeriodicCallback(lambda: active_children(), 600000).start()

ioloop.start()

Expand Down