Merge branch 'new-test-strategy' into 'master'

This commit fixes potential issues created by the new test strategy (in test-only runs)

See merge request !38

conda/meta.yaml

@@ -53,13 +53,10 @@ test:
 
   commands:
     - worker --help
-    {% if environ.get('BEAT_DOCKER_TESTS', False)  %}
-    - nosetests --with-coverage --cover-package={{ name }} -sv {{ name }}
-    {% else %}
-    - nosetests --with-coverage --cover-package={{ name }} -sv {{ name }} --exclude=".*test_docker.*"
-    {% endif %}
-    - sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx
-    - sphinx-build -aEb doctest {{ project_dir }}/doc sphinx
+    - if [ -n "${BEAT_DOCKER_TESTS}" ]; then nosetests --with-coverage --cover-package={{ name }} -sv {{ name }}; fi
+    - if [ -z "${BEAT_DOCKER_TESTS}" ]; then nosetests --with-coverage --cover-package={{ name }} -sv {{ name }} --exclude=".*test_docker.*"; fi
+    - if [ -z "${BEAT_DOCKER_TESTS}" ]; then sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx; fi
+    - if [ -z "${BEAT_DOCKER_TESTS}" ]; then sphinx-build -aEb doctest {{ project_dir }}/doc sphinx; fi
     - conda inspect linkages -p $PREFIX {{ name }}  # [not win]
     - conda inspect objects -p $PREFIX {{ name }}  # [osx]