fix: improve make test command (#863)

* fix: improve make test testing

Author: eshanholtz

.travis.yml

@@ -15,18 +15,18 @@ env:
   global:
     - CC_TEST_REPORTER_ID=$TRAVIS_CODE_CLIMATE_TOKEN SENDGRID_API_KEY=SGAPIKEY
 install:
-  - python setup.py install
-  - pip install pyyaml flask six coverage codecov
+  - make install
+  - make test-install
 before_script:
   - "./test/prism.sh &"
   - sleep 20
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
 script:
-  - coverage run -m unittest discover
+  - . venv/bin/activate; coverage run -m unittest discover
 after_script:
-  - codecov
+  - . venv/bin/activate; codecov
   - ./cc-test-reporter after-build --exit-code $?
 deploy:
   provider: pypi

Makefile

@@ -8,7 +8,12 @@ install: venv
 	. venv/bin/activate; python setup.py install
 	. venv/bin/activate; pip install -r requirements.txt
 
-test:
+test-install:
+	. venv/bin/activate; pip install -r test/requirements.txt
+
+test: test-install
+	./test/prism.sh &
+	sleep 2
 	. venv/bin/activate; python -m unittest discover -v
 
 clean: nopyc

test/requirements.txt

@@ -0,0 +1,6 @@
+pyyaml
+flask
+six
+coverage
+codecov
+mock