improved local test-running ability

call generate-version-file before tests, since they'll fall over if the version file isn't present
use /Users/leohemsted/.virtualenvs/api rather than looking for ./venv/ - if there's some other venv already active, then don't try and look for a current venv to activate

Makefile

@@ -75,7 +75,7 @@ upload-codedeploy-artifact: check-env-vars
 	aws s3 cp --region eu-west-1 target/notifications-api.zip s3://${DNS_NAME}-codedeploy/notifications-api-${DEPLOY_BUILD_NUMBER}.zip
 
 .PHONY: test
-test: venv ## Run tests
+test: venv generate-version-file ## Run tests
 	./scripts/run_tests.sh
 
 .PHONY: deploy-api

scripts/run_tests.sh

@@ -24,7 +24,7 @@ function display_result {
   fi
 }
 
-if [ -d venv ]; then
+if [ -z "$VIRTUAL_ENV" ]; then
   source ./venv/bin/activate
 fi
 pep8 .