From 657d6336e6c4f2dfc5d82e5adf06870246dd95bc Mon Sep 17 00:00:00 2001 From: jamessynge Date: Sat, 25 Nov 2017 20:28:21 -0500 Subject: [PATCH] Remove download_all call from tests, and instead do it in the travis.yml file before running the tests. --- .travis.yml | 1 + pocs/tests/conftest.py | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7aa4863e0..588808a80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,6 +61,7 @@ install: - cd $TRAVIS_BUILD_DIR - pip install -r requirements.txt - python setup.py install + - python pocs/utils/data.py script: - coverage run setup.py test - coverage combine .coverage* diff --git a/pocs/tests/conftest.py b/pocs/tests/conftest.py index ab09fd2eb..b55119de3 100644 --- a/pocs/tests/conftest.py +++ b/pocs/tests/conftest.py @@ -5,11 +5,6 @@ from pocs.utils.data import download_all_files from pocs.utils.database import PanMongo -try: - download_all_files() -except Exception as e: - pass - def pytest_addoption(parser): parser.addoption("--hardware-test", action="store_true", default=False, help="Test with hardware attached")