simon-dube / CARMIN-server / 370

88%

Pull #20

travis-ci

Merge branch 'develop' into path-upload-raw

# Conflicts:
#	server/common/error_codes_and_messages.py
#	server/resources/execution.py
#	server/resources/execution_kill.py
#	server/resources/execution_play.py
#	server/resources/execution_results.py
#	server/resources/executions.py
#	server/resources/helpers/execution_play.py
#	server/resources/helpers/execution_results.py
#	server/resources/helpers/executions.py
#	server/resources/helpers/pipelines.py
#	server/resources/models/descriptor/boutiques.py
#	server/resources/models/descriptor/descriptor_abstract.py
#	server/resources/models/descriptor/supported_descriptors.py
#	server/test/database/app.db
#	server/test/fakedata/executions.py
#	server/test/fakedata/pipelines.py
#	server/test/resources/test_executions.py

40 of 40 new or added lines in 3 files covered. (100.0%)

2475 of 2781 relevant lines covered (89.0%)

4.47 hits per line